diff --git a/.github/scripts/check-no-ffmpeg.sh b/.github/scripts/check-no-ffmpeg.sh new file mode 100755 index 00000000..3638ef9c --- /dev/null +++ b/.github/scripts/check-no-ffmpeg.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +# 配布する jar / litemod に FFmpeg の実行ファイルが入っていないことを確かめる +set -euo pipefail + +dir="${1:?usage: check-no-ffmpeg.sh }" +status=0 +found=0 + +for archive in "$dir"/*.jar "$dir"/*.litemod; do + [ -e "$archive" ] || continue + found=1 + # クラスファイル (Ffmpeg.class) は実行ファイルではないので除く。 + # jar の中の jar (Fabric 用) も調べる + if unzip -Z1 "$archive" | grep -Ei '(^|/)(ffmpeg|ffprobe)(\.exe)?$|\.(exe|dll|so|dylib)$'; then + echo "::error::$archive に実行ファイルが入っています" + status=1 + fi + nested="$(mktemp -d)" + unzip -q -o "$archive" 'META-INF/jars/*.jar' -d "$nested" 2>/dev/null || true + for inner in "$nested"/META-INF/jars/*.jar; do + [ -e "$inner" ] || continue + if unzip -Z1 "$inner" | grep -Ei '(^|/)(ffmpeg|ffprobe)(\.exe)?$|\.(exe|dll|so|dylib)$'; then + echo "::error::$archive の中の $(basename "$inner") に実行ファイルが入っています" + status=1 + fi + done + rm -rf "$nested" +done + +if [ "$found" -eq 0 ]; then + echo "::error::$dir に jar も litemod もありません" + exit 1 +fi +exit "$status" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..0377a9ed --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,50 @@ +name: CI + +on: + pull_request: + push: + branches-ignore: + - main + +permissions: + contents: read + +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 25 + uses: actions/setup-java@v4 + with: + java-version: '25' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Make gradle wrapper executable + run: chmod +x gradlew + + # 対応するすべてのバージョンの Minecraft を取得するため、時間がかかる + - name: Build with Gradle + run: ./gradlew :dist:assemble + + # FFmpeg は jar に入れない (利用者が自分で用意する) + - name: Check that FFmpeg is not bundled + run: bash .github/scripts/check-no-ffmpeg.sh dist/build/libs + + - name: Upload build output + uses: actions/upload-artifact@v4 + with: + name: MarumaSign + path: | + dist/build/libs/*.jar + dist/build/libs/*.litemod + if-no-files-found: error diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20502f88..ad9475d1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,14 +1,20 @@ name: Release Mod +# main に入った時点で、gradle.properties の mod_version と同じ名前のタグ (v4.0.0 など) がまだなければ、 +# ビルドして GitHub Release を作る。バージョンを上げずに main へ入れた場合は何もしない。 on: push: - tags: - - 'v*' - - '[0-9]+.[0-9]+.[0-9]+*' + branches: + - main + workflow_dispatch: permissions: contents: write +concurrency: + group: release + cancel-in-progress: false + jobs: build-and-release: runs-on: ubuntu-latest @@ -16,33 +22,60 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Read version from gradle.properties + id: version + shell: bash + run: | + VERSION=$(grep -E '^mod_version' gradle.properties | cut -d'=' -f2 | tr -d '[:space:]') + if [ -z "$VERSION" ]; then + echo "::error::gradle.properties に mod_version がありません" + exit 1 + fi + echo "version=${VERSION}" >> "$GITHUB_OUTPUT" + if git ls-remote --exit-code --tags origin "refs/tags/v${VERSION}" >/dev/null 2>&1; then + echo "Tag v${VERSION} already exists. Skipping release." + echo "release=false" >> "$GITHUB_OUTPUT" + else + echo "release=true" >> "$GITHUB_OUTPUT" + fi + - name: Set up JDK 25 + if: steps.version.outputs.release == 'true' uses: actions/setup-java@v4 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle + if: steps.version.outputs.release == 'true' uses: gradle/actions/setup-gradle@v4 - name: Make gradle wrapper executable + if: steps.version.outputs.release == 'true' run: chmod +x gradlew + # 対応するすべてのバージョンの Minecraft を取得するため、時間がかかる - name: Build with Gradle - run: ./gradlew build + if: steps.version.outputs.release == 'true' + run: ./gradlew :dist:assemble - - name: Get version from gradle.properties - id: get_version - run: | - VERSION=$(grep "mod_version" gradle.properties | cut -d'=' -f2 | tr -d '[:space:]') - echo "version=${VERSION}" >> $GITHUB_OUTPUT - shell: bash + # FFmpeg は jar に入れない (利用者が自分で用意する) + - name: Check that FFmpeg is not bundled + if: steps.version.outputs.release == 'true' + run: bash .github/scripts/check-no-ffmpeg.sh dist/build/libs - name: Create GitHub Release + if: steps.version.outputs.release == 'true' uses: softprops/action-gh-release@v2 with: + tag_name: v${{ steps.version.outputs.version }} + target_commitish: ${{ github.sha }} + name: MarumaSign ${{ steps.version.outputs.version }} + generate_release_notes: true files: | - build/libs/marumasa_sign-${{ steps.get_version.outputs.version }}.jar + dist/build/libs/*.jar + dist/build/libs/*.litemod + fail_on_unmatched_files: true draft: false prerelease: false env: diff --git a/.gitignore b/.gitignore index 239d83f5..cfbfd34b 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,7 @@ run/ # Decompiled Minecraft/mapping sources (generated locally by Loom, not project source) decompiled/ + +# Generated per-target Gradle project directories +/targets/ + diff --git a/README.md b/README.md index 4e260533..b235acaf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MarumaSign -看板に画像を表示する Minecraft の Mod です。 +看板に画像・動画・音声・3D モデルを表示する Minecraft の Mod です。 https://www.curseforge.com/minecraft/mc-mods/marumasign @@ -8,34 +8,180 @@ https://www.curseforge.com/minecraft/mc-mods/marumasign サーバーに、このModを導入する必要はありません。すべてクライアント側で動作します。 +バニラのサーバーでも、サバイバルモードでも使えます。 + +## ダウンロードするファイル + +使っているローダーに合わせて、次のどちらかを `mods` フォルダに入れてください。 + +| ローダー | ファイル | 備考 | +| --- | --- | --- | +| Fabric / Forge / NeoForge | `MarumaSign-<バージョン>.jar` | Minecraft のどのバージョンでも同じファイルです | +| LiteLoader | `MarumaSign-<バージョン>-liteloader-mc.litemod` | Minecraft のバージョンに合ったものを選んでください | + +LiteLoader だけファイルが分かれているのは、LiteLoader が Mod ごとに対応する Minecraft のバージョンを 1 つしか指定できないためです。 + +## 前提環境 + +各ローダー本体だけで動作します。Fabric API などの前提 Mod は必要ありません。 + +対応している Minecraft のバージョンとローダーの組み合わせ、および実機での動作確認の結果は +[docs/verification.md](docs/verification.md) を参照してください。 ## 使用方法 -1. ゲーム中、B キー を押します。( "キーの割り当て" で Bキー以外に変更できます) -2. 起動したブラウザから画像のアドレスや画像の大きさなどを設定します。 -3. "giveコマンド実行" ボタンを押すことで、Minecraftで MarumaSign の看板の give コマンドが実行されます。 -4. 看板を設置して完了です。 +1. ゲーム中、B キー を押します。( "キーの割り当て" の「その他」にある "MarumaSign" で変更できます) +2. 開いたウィンドウで、ファイルを選ぶか、URL を入力します。 + - 「参照...」ボタンでファイルを選べます。 + - Minecraft 1.14 以降では、ウィンドウにファイルをドロップすることもできます。 +3. 大きさ・位置・回転を設定して、「看板に書き込む」ボタンを押します。 +4. 看板を設置します。設置した看板に、表示するための文字が自動で書き込まれます。 -### 対応している拡張子 +ファイルを選んだ場合、ファイルは [Catbox](https://catbox.moe/) にアップロードされ、誰でもアクセスできる URL になります。 +公開したくないファイルは選ばないでください。 +### 対応している形式 + +ファイルの種類は、拡張子ではなく内容で判別します。 + +#### 画像 + +- `.png` (アニメーション PNG を含む) - `.gif` -- `.png` -- `.jpg` -- `.jpeg` +- `.jpg` / `.jpeg` +- `.bmp` + +#### 動画・音声 + +[FFmpeg](https://ffmpeg.org/) が読める形式 (`.mp4` `.webm` `.mkv` `.mov` `.avi` `.mp3` `.ogg` `.wav` `.flac` など) を再生できます。 +動画に含まれる音声も再生され、看板から離れるほど小さく聞こえます。音量はウィンドウの「動画と音声の音量」で変えられます。 +WebP や AVIF、TIFF など、上の「画像」にない形式の画像も、FFmpeg を通して表示します。 + +再生には FFmpeg が必要です。次のどちらかの方法で用意してください。 + +- FFmpeg をインストールして、`ffmpeg` と `ffprobe` をコマンドとして実行できる状態 (PATH が通った状態) にする +- ゲームフォルダ (`.minecraft` など) の中に `marumasign/ffmpeg` フォルダを作り、`ffmpeg` と `ffprobe` の実行ファイルを置く + +FFmpeg が見つからない場合は、動画や音声の看板を見たときにチャットで知らせます。 + +#### 3D モデル + +glTF 2.0 の `.glb` と `.gltf` を表示できます。 +`.gltf` が別のファイル (`.bin` や画像) を参照している場合、アップロードのときに自動で 1 つの `.glb` にまとめます。 + +モデルは、最も長い辺が画像の長い辺と同じ大きさになるように置かれ、正面 (+Z) が看板の正面を向きます。 +壁掛けの看板では、モデルの背面が壁に付きます。 + +対応している内容: + +- ノードの階層、メッシュ (三角形、帯、扇)、疎なアクセサ、整数に量子化された頂点 +- アニメーション (移動・回転・拡大・モーフィングの重み、補間は LINEAR / STEP / CUBICSPLINE)。最初のアニメーションを繰り返し再生します +- スキニング (1 頂点につきボーン 8 本まで) とモーフターゲット +- 材質: 色とテクスチャ、頂点の色、金属らしさと粗さ、法線マップ、遮蔽 (オクルージョン)、発光、透明度の扱い (OPAQUE / MASK / BLEND)、両面表示 +- テクスチャ: PNG / JPEG、複数のテクスチャ座標、繰り返しの指定 (繰り返し・折り返し・端で止める) +- 拡張: `KHR_materials_unlit` `KHR_materials_emissive_strength` `KHR_texture_transform` `KHR_mesh_quantization` `KHR_materials_pbrSpecularGlossiness` + +陰影について: + +どのバージョンの Minecraft でも同じ見た目になるように、材質の計算 (シェーダーに相当する処理) は Mod の中で行っています。 +照明はモデルに固定で、上面が最も明るく、側面、底面の順に暗くなります。 +動かないモデルで、法線マップや金属らしさ・粗さ・発光のテクスチャを使っている材質は、読み込みのときにピクセル単位で計算した結果をテクスチャに焼き込みます。 +アニメーションするモデルと、テクスチャの同じ場所を向きの違う多くの面で使い回しているモデルは、頂点単位の計算になり、これらのテクスチャの細かい模様は反映されません。 + +制限: + +- 三角形は 15 万枚まで、ファイルは外部ファイルを含めて 64 MB まで +- Draco と meshopt で圧縮されたモデルは読み込めません +- KTX2 (Basis) と WebP のテクスチャは読み込めず、その材質は色だけで表示されます +- 透過 (transmission) やクリアコートなど、上に挙げていない拡張の材質は、基本の材質として表示されます +- 光源とカメラの定義は使いません ### 看板のフォーマット -`[URL]|[X軸位置]|[Y軸位置]|[Z軸位置]|[高さ]|[横幅]|[X軸回転]|[Y軸回転]|[Z軸回転]` +`[URL]|[X軸位置]|[Y軸位置]|[Z軸位置]|[横幅]|[高さ]|[Z軸回転]|[Y軸回転]|[X軸回転]` -## 注意事項 +看板の 4 行 (Minecraft 1.20 以降は表と裏の合計 8 行) をつなげた文字列が、この形式になっていると表示されます。 +動画・音声・3D モデルでも同じ形式です。 -- URLの長さが`https://` の部分を含めて44文字以上だと看板にURLが入り切らないため動作しません。 +### 看板のアイテム -## 前提環境 +看板の文字をデータとして持っている看板のアイテム (クリエイティブモードで Ctrl を押しながらブロックを選択したときや、 +`/give` でデータ付きの看板を渡されたときなど) は、アイテムの見た目も、その看板と同じ画像・動画・3D モデルになります。 +インベントリの枠、手に持ったとき、地面に落ちているとき、額縁に入れたときのどれでも同じです。 +アイテムとしての見た目では、看板に書かれた位置・大きさ・回転は使わず、アイテムの大きさに収まるように表示します。 + +### 影 Mod (シェーダー) との併用 + +OptiFine、Iris、Oculus などの影 Mod とシェーダーパックを使っていても表示されます。 +絵や 3D モデルは、ブロックと同じようにシェーダーの光と影を受けます。 +そのため、色の見え方はシェーダーパックによって変わります (日なたでは明るく、日かげや夜は暗くなります)。 +確認した影 Mod とシェーダーパックの組み合わせは [docs/verification.md](docs/verification.md) にあります。 + +## 注意事項 -- Minecraft **26.2** -- [Fabric Loader](https://fabricmc.net/use/installer/) 0.19.3 以降 -- [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) 0.154.2 以降 +- 看板に入りきらない長さの URL は、自動で短縮されます。 +- Minecraft 1.7.10 のサーバーは看板 1 行につき 15 文字までしか受け付けないため、特に URL が短縮されやすくなります。 +- スペクテイターモードでは、画像と一緒に看板そのものも表示されます。 +- 画像は 10 MB まで、アップロードできる動画・音声は 200 MB までです。 + +## 開発者向け + +### 構成 + +| フォルダ | 内容 | +| --- | --- | +| `core` | Minecraft に依存しない共通の処理 (看板のフォーマット、画像の取得、ゲーム内のウィンドウなど) | +| `adapters` | Minecraft のバージョンごとの実装。共通部分と、世代ごとの差分に分かれています | +| `bootstrap` | 各ローダーから呼ばれ、実行中のバージョンに合った実装を選ぶ入口 | +| `dist` | 配布するファイルの組み立て | +| `tools` | 対応表の生成と、実機での動作確認を自動で行うスクリプト | + +対応するバージョンの一覧は `targets.json` にあり、`tools/gen_targets.py` から生成します。 +Minecraft 1.14 以降向けの実装のうち、バージョンによって細部が違うファイルは `tools/gen_adapters.py` から生成します +(生成したファイルもリポジトリに入っているので、ビルドには必要ありません)。 + +### ビルド + +```bash +./gradlew :dist:assemble +``` + +配布するファイルは `dist/build/libs` に出力されます。 +初回は対応するすべてのバージョンの Minecraft を取得するため、時間がかかります。 + +### 動作確認 + +```bash +python tools/verify/matrix.py +``` + +バニラのサーバーを起動し、各ローダーを入れた実際のクライアントで接続して、 +画像・3D モデル・動画を看板に書き込んで表示するまでと、看板の文字を持たせた看板アイテムの見た目を自動で確認します。 +[portablemc](https://github.com/mindstorm38/portablemc)、Pillow、FFmpeg が必要です。 + +```bash +# 影 Mod とシェーダーパックを入れた状態で確認する +python tools/verify/matrix.py --shaders +# シェーダーパックを変える (Modrinth での名前)。Forge 1.16.5 以降で OptiFine を使うときは --shader-mod optifine +python tools/verify/matrix.py --shaders --shader-pack complementary-reimagined +# 結果を docs/verification.md にまとめる +python tools/verify/report.py +``` + +Minecraft を起動せずに確認できるものもあります。 + +```bash +# 配布する jar が、対応しているすべてのバージョンの Minecraft と正しくつながるかを確かめる +# (1 つのビルドを近いバージョンでも使っているため、バージョン間の細かな違いをここで見つける) +python tools/check_linkage.py +``` + +```bash +# ゲーム内のウィンドウの見た目を PNG に書き出す +./gradlew :core:uiPreview +# 3D モデルを PNG に描く (出力先, アニメーションの時刻, モデルのファイル...) +./gradlew :core:gltfCheck -PgltfArgs="build/gltf 0.5 model.glb" +``` ## 貢献者 diff --git a/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/Join.java b/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/Join.java new file mode 100644 index 00000000..cf52b664 --- /dev/null +++ b/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/Join.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; + +/** + * 動作確認のときの、サーバーへの接続。 + * Minecraft 1.14 - 1.15.1 には、起動と同時に接続すると入れない組み合わせがあるので、起動が済んでから接続する。 + */ +final class Join { + + private Join() { + } + + // タイトル画面 (または、接続に失敗したあとの画面) が出ていて、リソースの読み込みが終わっていれば、接続を始める + static boolean start(Minecraft mc, String host, int port) { + final Screen screen = mc.screen; + if (mc.getOverlay() != null || !(screen instanceof TitleScreen || screen instanceof DisconnectedScreen)) return false; + mc.setScreen(new ConnectScreen(new TitleScreen(), mc, host, port)); + return true; + } +} diff --git a/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/ModelArrays.java b/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/ModelArrays.java new file mode 100644 index 00000000..f76eda15 --- /dev/null +++ b/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/ModelArrays.java @@ -0,0 +1,107 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL13; +import org.lwjgl.opengl.GL15; + +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.FloatBuffer; +import java.util.Map; +import java.util.WeakHashMap; + +/** + * 3D モデルの頂点を、配列にまとめて OpenGL に渡す。 + * 頂点が多いので、1 つずつ渡すと時間がかかる。 + */ +final class ModelArrays { + + private static final int BYTES_PER_VERTEX = SignImage.Batch.STRIDE * 4; + + private static final class Buffers { + final FloatBuffer vertices; + // 面の向き。影 Mod が光の当たり方を計算するのに使う + final FloatBuffer normals; + final ByteBuffer colors; + int revision = -1; + + Buffers(int vertexCount) { + vertices = BufferUtils.createFloatBuffer(vertexCount * SignImage.Batch.STRIDE); + normals = BufferUtils.createFloatBuffer(vertexCount * 3); + colors = BufferUtils.createByteBuffer(vertexCount * 4); + } + } + + // まとまりごとのバッファ。まとまりが使われなくなれば、一緒に破棄される + private static final Map BUFFERS = new WeakHashMap(); + + private ModelArrays() { + } + + static void draw(SignImage.Batch batch) { + Buffers buffers = BUFFERS.get(batch); + if (buffers == null) { + buffers = new Buffers(batch.vertexCount); + BUFFERS.put(batch, buffers); + } + if (buffers.revision != batch.revision) { + // 内容が変わったときだけ詰め直す。 + // clear などは、新しい Java とは戻り値の型が違うので、どの Java でも同じ呼び出しになるよう Buffer として呼ぶ + ((Buffer) buffers.vertices).clear(); + buffers.vertices.put(batch.vertices, 0, batch.vertexCount * SignImage.Batch.STRIDE); + ((Buffer) buffers.colors).clear(); + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int color = colors[i]; + buffers.colors.put((byte) (color >> 16)).put((byte) (color >> 8)).put((byte) color).put((byte) (color >>> 24)); + } + ((Buffer) buffers.colors).flip(); + fillNormals(batch, buffers.normals); + buffers.revision = batch.revision; + } + + // 変更した状態は glPopClientAttrib で元に戻す + GL11.glPushClientAttrib(GL11.GL_CLIENT_VERTEX_ARRAY_BIT); + GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); + GL13.glClientActiveTexture(GL13.GL_TEXTURE0); + GL11.glEnableClientState(GL11.GL_NORMAL_ARRAY); + GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); + GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY); + GL11.glEnableClientState(GL11.GL_COLOR_ARRAY); + // 位置とテクスチャ座標は、同じバッファに交互に入っている + ((Buffer) buffers.vertices).position(0); + GL11.glVertexPointer(3, GL11.GL_FLOAT, BYTES_PER_VERTEX, buffers.vertices); + ((Buffer) buffers.vertices).position(3); + GL11.glTexCoordPointer(2, GL11.GL_FLOAT, BYTES_PER_VERTEX, buffers.vertices); + ((Buffer) buffers.colors).position(0); + GL11.glColorPointer(4, GL11.GL_UNSIGNED_BYTE, 0, buffers.colors); + GL11.glNormalPointer(GL11.GL_FLOAT, 0, buffers.normals); + GL11.glDrawArrays(GL11.GL_QUADS, 0, batch.vertexCount); + GL11.glPopClientAttrib(); + } + + // 四角形ごとに、面の向きを求めて入れる。三角形は 3 つ目の頂点を重ねた四角形なので、最初の 3 頂点から求める + private static void fillNormals(SignImage.Batch batch, FloatBuffer normals) { + final float[] mesh = batch.vertices; + ((Buffer) normals).clear(); + for (int i = 0; i + 3 < batch.vertexCount; i += 4) { + final int a = i * SignImage.Batch.STRIDE, b = a + SignImage.Batch.STRIDE, c = b + SignImage.Batch.STRIDE; + final float ux = mesh[b] - mesh[a], uy = mesh[b + 1] - mesh[a + 1], uz = mesh[b + 2] - mesh[a + 2]; + final float vx = mesh[c] - mesh[a], vy = mesh[c + 1] - mesh[a + 1], vz = mesh[c + 2] - mesh[a + 2]; + float nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) { + nx /= length; + ny /= length; + nz /= length; + } else { + // 面積のない面は、上向きとして扱う + ny = 1; + } + for (int k = 0; k < 4; k++) normals.put(nx).put(ny).put(nz); + } + ((Buffer) normals).flip(); + } +} diff --git a/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java b/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java new file mode 100644 index 00000000..7413e216 --- /dev/null +++ b/adapters/ber14/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java @@ -0,0 +1,131 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import org.lwjgl.opengl.GL11; + +import java.lang.reflect.Field; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + */ +final class SignRendererBase extends BlockEntityRenderer { + + private static Field renderersField; + + private final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + private SignRendererBase(BlockEntityRenderer delegate) { + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + final BlockEntityRenderDispatcher dispatcher = BlockEntityRenderDispatcher.instance; + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + // このバージョンでは、ブロックエンティティのクラスをキーにした表になっている + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(SignBlockEntity.class); + if (current == null || current instanceof SignRendererBase) return; + + final SignRendererBase wrapper = new SignRendererBase((BlockEntityRenderer) current); + wrapper.init(dispatcher); + renderers.put(SignBlockEntity.class, wrapper); + } + + @Override + public void render(SignBlockEntity sign, double x, double y, double z, float partialTicks, int destroyStage) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + // スペクテイターには看板そのものも見せる + if (image == null || (mc.player != null && mc.player.isSpectator())) { + delegate.render(sign, x, y, z, partialTicks, destroyStage); + } + if (image == null || destroyStage >= 0) return; + + final BlockState blockState = sign.getBlockState(); + final boolean wall; + final float yaw; + if (blockState.getBlock() instanceof WallSignBlock) { + wall = true; + yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + wall = false; + yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + return; + } + final SignImage.Batch[] batches = image.batches(yaw, wall, Math.sqrt(x * x + y * y + z * z)); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + drawBatches(batches); + GL11.glPopMatrix(); + MarumaSign.drawn(image); + } + + /** + * 四角形のまとまりを、現在の座標系に描く。看板のアイテムを描くときにも使う。 + */ + static void drawBatches(SignImage.Batch[] batches) { + // 変更した状態は glPopAttrib で元に戻す + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_CURRENT_BIT | GL11.GL_LIGHTING_BIT + | GL11.GL_DEPTH_BUFFER_BIT); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1f, 1f, 1f, 1f); + + for (SignImage.Batch batch : batches) { + Minecraft.getInstance().getTextureManager().bind(((Tex) batch.texture).id); + if (batch.colors != null) { + // 3D モデルは裏を向いた面と、透明な部分を描かない + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1f); + GL11.glDepthMask(!batch.blend); + ModelArrays.draw(batch); + continue; + } + final float[] mesh = batch.vertices; + GL11.glBegin(GL11.GL_QUADS); + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + if ((i & 3) == 0 && i + 2 < batch.vertexCount) { + // 面の向き。影 Mod が光の当たり方を計算するのに使う (通常の描画では使われない) + final int b = o + SignImage.Batch.STRIDE, c = b + SignImage.Batch.STRIDE; + final float ux = mesh[b] - mesh[o], uy = mesh[b + 1] - mesh[o + 1], uz = mesh[b + 2] - mesh[o + 2]; + final float vx = mesh[c] - mesh[o], vy = mesh[c + 1] - mesh[o + 1], vz = mesh[c + 2] - mesh[o + 2]; + final float nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) GL11.glNormal3f(nx / length, ny / length, nz / length); + } + GL11.glTexCoord2f(mesh[o + 3], mesh[o + 4]); + GL11.glVertex3f(mesh[o], mesh[o + 1], mesh[o + 2]); + } + GL11.glEnd(); + } + GL11.glPopAttrib(); + } + + @Override + public boolean shouldRenderOffScreen(SignBlockEntity sign) { + return true; + } +} diff --git a/adapters/ber16/main/java/marumasa/marumasa_sign/adapter/Join.java b/adapters/ber16/main/java/marumasa/marumasa_sign/adapter/Join.java new file mode 100644 index 00000000..cf52b664 --- /dev/null +++ b/adapters/ber16/main/java/marumasa/marumasa_sign/adapter/Join.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; + +/** + * 動作確認のときの、サーバーへの接続。 + * Minecraft 1.14 - 1.15.1 には、起動と同時に接続すると入れない組み合わせがあるので、起動が済んでから接続する。 + */ +final class Join { + + private Join() { + } + + // タイトル画面 (または、接続に失敗したあとの画面) が出ていて、リソースの読み込みが終わっていれば、接続を始める + static boolean start(Minecraft mc, String host, int port) { + final Screen screen = mc.screen; + if (mc.getOverlay() != null || !(screen instanceof TitleScreen || screen instanceof DisconnectedScreen)) return false; + mc.setScreen(new ConnectScreen(new TitleScreen(), mc, host, port)); + return true; + } +} diff --git a/adapters/ber16/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java b/adapters/ber16/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java new file mode 100644 index 00000000..4ca274f9 --- /dev/null +++ b/adapters/ber16/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java @@ -0,0 +1,97 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + */ +final class SignRendererBase extends BlockEntityRenderer { + + private static Field renderersField; + + private final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + private SignRendererBase(BlockEntityRenderDispatcher dispatcher, BlockEntityRenderer delegate) { + super(dispatcher); + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + final BlockEntityRenderDispatcher dispatcher = BlockEntityRenderDispatcher.instance; + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(Mc.SIGN); + if (current == null || current instanceof SignRendererBase) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map, BlockEntityRenderer> replaced = new HashMap, BlockEntityRenderer>(renderers); + replaced.put(Mc.SIGN, new SignRendererBase(dispatcher, (BlockEntityRenderer) current)); + Reflect.set(renderersField, dispatcher, replaced); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + // スペクテイターには看板そのものも見せる + if (image == null || (mc.player != null && mc.player.isSpectator())) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + if (image == null) return; + + final BlockState blockState = sign.getBlockState(); + final boolean wall; + final float yaw; + if (blockState.getBlock() instanceof WallSignBlock) { + wall = true; + yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + wall = false; + yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + return; + } + + for (SignImage.Batch batch : image.batches(yaw, wall, distance(sign))) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + // カメラから看板までの距離 (ブロック) + private double distance(SignBlockEntity sign) { + final Vec3 camera = mc.gameRenderer.getMainCamera().getPosition(); + final double x = sign.getBlockPos().getX() + 0.5 - camera.x; + final double y = sign.getBlockPos().getY() + 0.5 - camera.y; + final double z = sign.getBlockPos().getZ() + 0.5 - camera.z; + return Math.sqrt(x * x + y * y + z * z); + } + + @Override + public boolean shouldRenderOffScreen(SignBlockEntity sign) { + return true; + } +} diff --git a/adapters/board_model/main/java/marumasa/marumasa_sign/adapter/SignBoards.java b/adapters/board_model/main/java/marumasa/marumasa_sign/adapter/SignBoards.java new file mode 100644 index 00000000..df8e96e7 --- /dev/null +++ b/adapters/board_model/main/java/marumasa/marumasa_sign/adapter/SignBoards.java @@ -0,0 +1,146 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.block.BlockStateModelSet; +import net.minecraft.client.renderer.block.dispatch.BlockStateModel; +import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.sprite.Material; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 看板の板を隠す。(Minecraft 26.2 以降) + * このバージョンから、看板の板は地形と一緒にブロックのモデルとして描かれるようになり、看板のレンダラーを包むだけでは消せない。 + * そこで、看板のブロックのモデルを包み、MarumaSign の看板がある位置では何も描かないようにする。 + * ほかの看板は、元のモデルがそのまま描かれる。 + */ +final class SignBoards { + + private static Field modelsField; + private static List signStates; + + // 板を隠す位置。キーは、その位置を表す目印の値 (key を参照) + private static final Map HIDDEN = new ConcurrentHashMap(); + + private SignBoards() { + } + + // 看板のブロックのモデルがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + static void install(Minecraft mc) { + // ブロックのモデルは、ワールドに入る前にはまだ読み込まれていないことがある + if (mc.level == null) return; + final ModelManager manager = mc.getModelManager(); + if (manager == null) return; + final BlockStateModelSet set = manager.getBlockStateModelSet(); + if (set == null) return; + if (modelsField == null) modelsField = Reflect.fieldOfType(BlockStateModelSet.class, Map.class); + final Map models = Reflect.get(modelsField, set); + if (models == null) return; + + if (signStates == null) { + final List states = new ArrayList(); + for (Block block : BuiltInRegistries.BLOCK) { + if (block instanceof StandingSignBlock || block instanceof WallSignBlock) { + states.addAll(block.getStateDefinition().getPossibleStates()); + } + } + signStates = states; + } + + boolean wrapped = true; + for (BlockState state : signStates) { + final BlockStateModel model = models.get(state); + if (model != null && !(model instanceof Model)) wrapped = false; + } + if (wrapped) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map replaced = new HashMap(models); + for (BlockState state : signStates) { + final BlockStateModel model = replaced.get(state); + if (model != null && !(model instanceof Model)) replaced.put(state, new Model(model)); + } + Reflect.set(modelsField, set, replaced); + + // すでに描かれている地形には反映されていないので、板を隠す位置を描き直してもらう + if (mc.level != null) { + for (BlockPos pos : HIDDEN.values()) redraw(mc.level, pos); + } + } + + /** + * 看板の板を隠すかどうかを記録する。看板を描く準備のたびに呼ぶ。 + * 変わったときは、その位置の地形を描き直してもらう。 + */ + static void track(SignBlockEntity sign, boolean hide) { + final BlockPos pos = sign.getBlockPos(); + final Long key = key(sign.getBlockState(), pos); + if (hide) { + if (HIDDEN.putIfAbsent(key, pos.immutable()) == null) redraw(sign.getLevel(), pos); + } else if (HIDDEN.remove(key) != null) { + redraw(sign.getLevel(), pos); + } + } + + /** + * 位置を表す目印の値。 + * 地形を描く処理は、モデルに位置を渡さない代わりに、位置から決まる種で初期化した乱数を渡す。 + * その乱数が最初に返す値を目印にすれば、モデルの側でどの位置を描いているのかを見分けられる。 + */ + private static long key(BlockState state, BlockPos pos) { + return RandomSource.createThreadLocalInstance(state.getSeed(pos)).nextLong(); + } + + private static void redraw(Level level, BlockPos pos) { + if (!(level instanceof ClientLevel)) return; + final BlockState state = level.getBlockState(pos); + // 8 は、すぐに描き直すことを表す + ((ClientLevel) level).sendBlockUpdated(pos, state, state, 8); + } + + /** + * 看板のブロックのモデル。板を隠す位置では何も描かず、それ以外は元のモデルに任せる。 + */ + private static final class Model implements BlockStateModel { + + private final BlockStateModel delegate; + + Model(BlockStateModel delegate) { + this.delegate = delegate; + } + + @Override + public void collectParts(RandomSource random, List parts) { + // 隠す看板が 1 つもなければ、乱数には触らない + if (!HIDDEN.isEmpty() && HIDDEN.containsKey(random.nextLong())) return; + delegate.collectParts(random, parts); + } + + @Override + public Material.Baked particleMaterial() { + return delegate.particleMaterial(); + } + + @Override + public int materialFlags() { + return delegate.materialFlags(); + } + } +} \ No newline at end of file diff --git a/adapters/board_none/main/java/marumasa/marumasa_sign/adapter/SignBoards.java b/adapters/board_none/main/java/marumasa/marumasa_sign/adapter/SignBoards.java new file mode 100644 index 00000000..9e11fe33 --- /dev/null +++ b/adapters/board_none/main/java/marumasa/marumasa_sign/adapter/SignBoards.java @@ -0,0 +1,20 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板の板を隠す。(Minecraft 26.1 まで) + * このバージョンでは、看板の板は看板のレンダラーが描くので、レンダラーを包むだけで消せる。ここでは何もしない。 + */ +final class SignBoards { + + private SignBoards() { + } + + static void install(Minecraft mc) { + } + + static void track(SignBlockEntity sign, boolean hide) { + } +} \ No newline at end of file diff --git a/adapters/classic/main/java/marumasa/marumasa_sign/adapter/UiScreenBase.java b/adapters/classic/main/java/marumasa/marumasa_sign/adapter/UiScreenBase.java new file mode 100644 index 00000000..aad44cd8 --- /dev/null +++ b/adapters/classic/main/java/marumasa/marumasa_sign/adapter/UiScreenBase.java @@ -0,0 +1,112 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.ui.Key; +import marumasa.marumasa_sign.core.ui.UiRoot; +import net.minecraft.client.gui.screens.Screen; + +import java.io.File; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +/** + * MarumaSign の画面。入力を core の UiRoot に橋渡しする。 + * 描画のメソッドはバージョンによって引数が違うため、UiScreen 側で実装する。 + */ +abstract class UiScreenBase extends Screen { + + protected final UiRoot ui = MarumaSign.ui(); + + protected UiScreenBase() { + super(Mc.text("MarumaSign")); + ui.opened(); + } + + @Override + protected void init() { + final Window window = Mc.window(minecraft); + ui.layout(window.getWidth(), window.getHeight()); + } + + @Override + public void removed() { + ui.closed(); + } + + @Override + public boolean isPauseScreen() { + return false; + } + + // 描画の直前に呼ぶ。画面に貼るテクスチャを返す (なければ null) + protected final Tex prepare() { + final Window window = Mc.window(minecraft); + ui.layout(window.getWidth(), window.getHeight()); + ui.mouseMoved(mouseX(), mouseY()); + return (Tex) ui.texture(); + } + + // GUI の拡大率を打ち消して、ピクセル単位で描くための倍率 + protected final float unscale() { + return (float) (1.0 / Mc.window(minecraft).getGuiScale()); + } + + // マウスの座標 (ウィンドウ上の位置) をフレームバッファのピクセル単位にする + private double mouseX() { + final Window window = Mc.window(minecraft); + return minecraft.mouseHandler.xpos() * window.getWidth() / Math.max(1, window.getScreenWidth()); + } + + private double mouseY() { + final Window window = Mc.window(minecraft); + return minecraft.mouseHandler.ypos() * window.getHeight() / Math.max(1, window.getScreenHeight()); + } + + @Override + public boolean mouseClicked(double x, double y, int button) { + if (button == 0) ui.mousePressed(mouseX(), mouseY()); + return true; + } + + @Override + public boolean mouseReleased(double x, double y, int button) { + if (button == 0) ui.mouseReleased(mouseX(), mouseY()); + return true; + } + + // スクロールのメソッドはバージョンによって引数の数が違う。 + // 両方を用意しておき、そのバージョンにあるほうが呼ばれる (そのため @Override は付けない) + public boolean mouseScrolled(double x, double y, double amount) { + ui.mouseScrolled(mouseX(), mouseY(), amount); + return true; + } + + public boolean mouseScrolled(double x, double y, double scrollX, double scrollY) { + ui.mouseScrolled(mouseX(), mouseY(), scrollY); + return true; + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + final int key = Key.fromGlfw(keyCode); + if (key != Key.UNKNOWN) ui.keyPressed(key, Key.modifiersFromGlfw(modifiers)); + return true; + } + + @Override + public boolean charTyped(char character, int modifiers) { + ui.charTyped(character); + return true; + } + + // ファイルのドロップは 1.15 以降にしかないため、@Override は付けない + public void onFilesDrop(List paths) { + final List files = new ArrayList(); + for (Path path : paths) { + files.add(path.toFile()); + } + ui.filesDropped(files); + } +} diff --git a/adapters/classic_ber/main/java/marumasa/marumasa_sign/adapter/Join.java b/adapters/classic_ber/main/java/marumasa/marumasa_sign/adapter/Join.java new file mode 100644 index 00000000..22940f9f --- /dev/null +++ b/adapters/classic_ber/main/java/marumasa/marumasa_sign/adapter/Join.java @@ -0,0 +1,44 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.multiplayer.resolver.ServerAddress; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +/** + * 動作確認のときの、サーバーへの接続。 + * Minecraft 1.17 は、起動と同時に接続すると落ちる (1.17.1 で直っている) ので、起動が済んでから接続する。 + */ +final class Join { + + private Join() { + } + + // タイトル画面 (または、接続に失敗したあとの画面) が出ていて、リソースの読み込みが終わっていれば、接続を始める + static boolean start(Minecraft mc, String host, int port) { + final Screen screen = mc.screen; + if (mc.getOverlay() != null || !(screen instanceof TitleScreen || screen instanceof DisconnectedScreen)) return false; + // 接続を始めるメソッドは、バージョンが上がるにつれて後ろの引数が増えているので、先頭の引数の型で探す + for (Method method : ConnectScreen.class.getMethods()) { + final Class[] types = method.getParameterTypes(); + if (!Modifier.isStatic(method.getModifiers()) || types.length < 3) continue; + if (types[0] != Screen.class || types[1] != Minecraft.class || types[2] != ServerAddress.class) continue; + final Object[] arguments = new Object[types.length]; + arguments[0] = new TitleScreen(); + arguments[1] = mc; + arguments[2] = ServerAddress.parseString(host + ":" + port); + for (int i = 3; i < types.length; i++) { + if (types[i] == boolean.class) arguments[i] = Boolean.FALSE; + } + Reflect.invoke(method, null, arguments); + return true; + } + return false; + } +} diff --git a/adapters/classic_ber/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java b/adapters/classic_ber/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java new file mode 100644 index 00000000..f933d16f --- /dev/null +++ b/adapters/classic_ber/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java @@ -0,0 +1,115 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + * render の引数はバージョンによって違うため、SignRendererWrapper 側で実装する。 + */ +abstract class SignRendererBase implements BlockEntityRenderer { + + private static Field renderersField; + + protected final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + protected SignRendererBase(BlockEntityRenderer delegate) { + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + final BlockEntityRenderDispatcher dispatcher = mc.getBlockEntityRenderDispatcher(); + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(Mc.SIGN); + if (current == null || current instanceof SignRendererBase) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map, BlockEntityRenderer> replaced = new HashMap, BlockEntityRenderer>(renderers); + replaced.put(Mc.SIGN, new SignRendererWrapper((BlockEntityRenderer) current)); + Reflect.set(renderersField, dispatcher, replaced); + } + + /** + * MarumaSign の看板なら画像を描く。 + * 看板そのものも描くべきなら true を返す (MarumaSign の看板でないとき、またはスペクテイターのとき)。 + */ + protected final boolean drawImage(SignBlockEntity sign, PoseStack poseStack, MultiBufferSource buffers, int light) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + if (image == null) return true; + + final BlockState blockState = sign.getBlockState(); + final boolean wall; + final float yaw; + if (blockState.getBlock() instanceof WallSignBlock) { + wall = true; + yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + wall = false; + yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + return true; + } + + for (SignImage.Batch batch : image.batches(yaw, wall, distance(sign))) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + return mc.player != null && mc.player.isSpectator(); + } + + // カメラから看板までの距離 (ブロック) + private double distance(SignBlockEntity sign) { + final Vec3 camera = mc.gameRenderer.getMainCamera().getPosition(); + final double x = sign.getBlockPos().getX() + 0.5 - camera.x; + final double y = sign.getBlockPos().getY() + 0.5 - camera.y; + final double z = sign.getBlockPos().getZ() + 0.5 - camera.z; + return Math.sqrt(x * x + y * y + z * z); + } + + // 以下のメソッドはバージョンによって有無や引数が違う。 + // 両方を用意しておき、そのバージョンにあるほうが使われる (そのため @Override は付けない) + + public boolean shouldRenderOffScreen() { + return true; + } + + public boolean shouldRenderOffScreen(SignBlockEntity sign) { + return true; + } + + public int getViewDistance() { + return 512; + } + + public boolean shouldRender(SignBlockEntity sign, Vec3 cameraPosition) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + final double distance = image == null ? 64.0 : image.viewDistance(); + final double x = sign.getBlockPos().getX() + 0.5 - cameraPosition.x; + final double y = sign.getBlockPos().getY() + 0.5 - cameraPosition.y; + final double z = sign.getBlockPos().getZ() + 0.5 - cameraPosition.z; + return x * x + y * y + z * z < distance * distance; + } +} diff --git a/adapters/common/fabric/java/marumasa/marumasa_sign/adapter/FabricEntry.java b/adapters/common/fabric/java/marumasa/marumasa_sign/adapter/FabricEntry.java new file mode 100644 index 00000000..85000f87 --- /dev/null +++ b/adapters/common/fabric/java/marumasa/marumasa_sign/adapter/FabricEntry.java @@ -0,0 +1,14 @@ +package marumasa.marumasa_sign.adapter; + +import net.fabricmc.api.ClientModInitializer; + +/** + * Fabric から起動されたときの入口。 + */ +public final class FabricEntry implements ClientModInitializer { + + @Override + public void onInitializeClient() { + Adapter.start("fabric"); + } +} \ No newline at end of file diff --git a/adapters/common/forge/java/marumasa/marumasa_sign/adapter/Entry.java b/adapters/common/forge/java/marumasa/marumasa_sign/adapter/Entry.java new file mode 100644 index 00000000..773e0cfe --- /dev/null +++ b/adapters/common/forge/java/marumasa/marumasa_sign/adapter/Entry.java @@ -0,0 +1,20 @@ +package marumasa.marumasa_sign.adapter; + +/** + * Forge から起動されたときの入口。 + */ +public final class Entry { + + private Entry() { + } + + public static void start() { + // クライアントにしかないクラスの有無で、サーバーではないことを確かめる + try { + Class.forName("net.minecraft.client.Minecraft", false, Entry.class.getClassLoader()); + } catch (ClassNotFoundException | LinkageError e) { + return; + } + Adapter.start("forge"); + } +} \ No newline at end of file diff --git a/adapters/common/neoforge/java/marumasa/marumasa_sign/adapter/Entry.java b/adapters/common/neoforge/java/marumasa/marumasa_sign/adapter/Entry.java new file mode 100644 index 00000000..b8e5c931 --- /dev/null +++ b/adapters/common/neoforge/java/marumasa/marumasa_sign/adapter/Entry.java @@ -0,0 +1,20 @@ +package marumasa.marumasa_sign.adapter; + +/** + * NeoForge から起動されたときの入口。 + */ +public final class Entry { + + private Entry() { + } + + public static void start() { + // クライアントにしかないクラスの有無で、サーバーではないことを確かめる + try { + Class.forName("net.minecraft.client.Minecraft", false, Entry.class.getClassLoader()); + } catch (ClassNotFoundException | LinkageError e) { + return; + } + Adapter.start("neoforge"); + } +} \ No newline at end of file diff --git a/adapters/item_bewlr_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_bewlr_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..3c84f371 --- /dev/null +++ b/adapters/item_bewlr_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,171 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.17 - 1.19.2) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems { + + private static Field shaperField; + private static Field rendererField; + + private SignItems() { + } + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) { + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + if (rendererField == null) { + rendererField = Reflect.fieldOfType(ItemRenderer.class, BlockEntityWithoutLevelRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + } + final BlockEntityWithoutLevelRenderer renderer = Reflect.get(rendererField, itemRenderer); + if (renderer != null && !(renderer instanceof Renderer)) { + Reflect.set(rendererField, itemRenderer, new Renderer(renderer, mc)); + } + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) { + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + } + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[8]; + if (tag.contains("front_text")) { + // 1.20 以降: 表と裏 + readLines(tag.getCompound("front_text"), lines, 0); + readLines(tag.getCompound("back_text"), lines, 4); + } else { + for (int i = 0; i < 4; i++) { + lines[i] = tag.getString("Text" + (i + 1)); + } + } + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + // 8 は文字列のタグの種類 + final ListTag messages = text.getList("messages", 8); + for (int i = 0; i < 4 && i < messages.size(); i++) { + lines[offset + i] = messages.getString(i); + } + } + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper { + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) { + super(mc.getModelManager()); + this.delegate = delegate; + } + + @Override + public BakedModel getItemModel(ItemStack stack) { + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) { + replaced = new BuiltInModel(model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon(), model.usesBlockLight()); + builtIn.put(model, replaced); + } + return replaced; + } + + @Override + public BakedModel getItemModel(Item item) { + return delegate.getItemModel(item); + } + + @Override + public ModelManager getModelManager() { + return delegate.getModelManager(); + } + + @Override + public void register(Item item, ModelResourceLocation location) { + delegate.register(item, location); + } + + @Override + public void rebuildCache() { + delegate.rebuildCache(); + builtIn.clear(); + } + } + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends BlockEntityWithoutLevelRenderer { + + private final BlockEntityWithoutLevelRenderer delegate; + + Renderer(BlockEntityWithoutLevelRenderer delegate, Minecraft mc) { + super(mc.getBlockEntityRenderDispatcher(), mc.getEntityModels()); + this.delegate = delegate; + } + + @Override + public void renderByItem(ItemStack stack, ItemTransforms.TransformType context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + final SignImage image = find(stack); + if (image == null) { + delegate.renderByItem(stack, context, poseStack, buffers, light, overlay); + return; + } + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + @Override + public void onResourceManagerReload(ResourceManager resourceManager) { + delegate.onResourceManagerReload(resourceManager); + } + } +} diff --git a/adapters/item_bewlr_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_bewlr_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..521f5406 --- /dev/null +++ b/adapters/item_bewlr_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,171 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.19.3 - 1.21.1) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems { + + private static Field shaperField; + private static Field rendererField; + + private SignItems() { + } + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) { + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + if (rendererField == null) { + rendererField = Reflect.fieldOfType(ItemRenderer.class, BlockEntityWithoutLevelRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + } + final BlockEntityWithoutLevelRenderer renderer = Reflect.get(rendererField, itemRenderer); + if (renderer != null && !(renderer instanceof Renderer)) { + Reflect.set(rendererField, itemRenderer, new Renderer(renderer, mc)); + } + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) { + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + } + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[8]; + if (tag.contains("front_text")) { + // 1.20 以降: 表と裏 + readLines(tag.getCompound("front_text"), lines, 0); + readLines(tag.getCompound("back_text"), lines, 4); + } else { + for (int i = 0; i < 4; i++) { + lines[i] = tag.getString("Text" + (i + 1)); + } + } + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + // 8 は文字列のタグの種類 + final ListTag messages = text.getList("messages", 8); + for (int i = 0; i < 4 && i < messages.size(); i++) { + lines[offset + i] = messages.getString(i); + } + } + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper { + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) { + super(mc.getModelManager()); + this.delegate = delegate; + } + + @Override + public BakedModel getItemModel(ItemStack stack) { + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) { + replaced = new BuiltInModel(model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon(), model.usesBlockLight()); + builtIn.put(model, replaced); + } + return replaced; + } + + @Override + public BakedModel getItemModel(Item item) { + return delegate.getItemModel(item); + } + + @Override + public ModelManager getModelManager() { + return delegate.getModelManager(); + } + + @Override + public void register(Item item, ModelResourceLocation location) { + delegate.register(item, location); + } + + @Override + public void rebuildCache() { + delegate.rebuildCache(); + builtIn.clear(); + } + } + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends BlockEntityWithoutLevelRenderer { + + private final BlockEntityWithoutLevelRenderer delegate; + + Renderer(BlockEntityWithoutLevelRenderer delegate, Minecraft mc) { + super(mc.getBlockEntityRenderDispatcher(), mc.getEntityModels()); + this.delegate = delegate; + } + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + final SignImage image = find(stack); + if (image == null) { + delegate.renderByItem(stack, context, poseStack, buffers, light, overlay); + return; + } + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + @Override + public void onResourceManagerReload(ResourceManager resourceManager) { + delegate.onResourceManagerReload(resourceManager); + } + } +} diff --git a/adapters/item_bewlr_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_bewlr_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..e6224824 --- /dev/null +++ b/adapters/item_bewlr_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,159 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.21.2 - 1.21.3) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems { + + private static Field shaperField; + private static Field rendererField; + + private SignItems() { + } + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) { + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + if (rendererField == null) { + rendererField = Reflect.fieldOfType(ItemRenderer.class, BlockEntityWithoutLevelRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + } + final BlockEntityWithoutLevelRenderer renderer = Reflect.get(rendererField, itemRenderer); + if (renderer != null && !(renderer instanceof Renderer)) { + Reflect.set(rendererField, itemRenderer, new Renderer(renderer, mc)); + } + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) { + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + } + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[8]; + if (tag.contains("front_text")) { + // 1.20 以降: 表と裏 + readLines(tag.getCompound("front_text"), lines, 0); + readLines(tag.getCompound("back_text"), lines, 4); + } else { + for (int i = 0; i < 4; i++) { + lines[i] = tag.getString("Text" + (i + 1)); + } + } + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + // 8 は文字列のタグの種類 + final ListTag messages = text.getList("messages", 8); + for (int i = 0; i < 4 && i < messages.size(); i++) { + lines[offset + i] = messages.getString(i); + } + } + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper { + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) { + super(mc.getModelManager()); + this.delegate = delegate; + } + + @Override + public BakedModel getItemModel(ItemStack stack) { + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) { + replaced = new BuiltInModel(model.getTransforms(), model.getParticleIcon(), model.usesBlockLight()); + builtIn.put(model, replaced); + } + return replaced; + } + + @Override + public BakedModel getItemModel(ResourceLocation location) { + return delegate.getItemModel(location); + } + + @Override + public void invalidateCache() { + delegate.invalidateCache(); + builtIn.clear(); + } + } + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends BlockEntityWithoutLevelRenderer { + + private final BlockEntityWithoutLevelRenderer delegate; + + Renderer(BlockEntityWithoutLevelRenderer delegate, Minecraft mc) { + super(mc.getBlockEntityRenderDispatcher(), mc.getEntityModels()); + this.delegate = delegate; + } + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + final SignImage image = find(stack); + if (image == null) { + delegate.renderByItem(stack, context, poseStack, buffers, light, overlay); + return; + } + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + @Override + public void onResourceManagerReload(ResourceManager resourceManager) { + delegate.onResourceManagerReload(resourceManager); + } + } +} diff --git a/adapters/item_components/main/java/marumasa/marumasa_sign/adapter/SignItemData.java b/adapters/item_components/main/java/marumasa/marumasa_sign/adapter/SignItemData.java new file mode 100644 index 00000000..408d70cf --- /dev/null +++ b/adapters/item_components/main/java/marumasa/marumasa_sign/adapter/SignItemData.java @@ -0,0 +1,22 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; + +/** + * アイテムが持っているブロックエンティティのデータ。(Minecraft 1.20.5 以降: アイテムのコンポーネントになっている) + */ +final class SignItemData { + + private SignItemData() { + } + + // データがなければ null + static CompoundTag blockEntityTag(ItemStack stack) { + final CustomData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + // 読むだけなので、写しを作らずに中身をそのまま使う + return data == null ? null : data.getUnsafe(); + } +} diff --git a/adapters/item_legacy17/forge/java/marumasa/marumasa_sign/adapter/ForgeInstaller.java b/adapters/item_legacy17/forge/java/marumasa/marumasa_sign/adapter/ForgeInstaller.java new file mode 100644 index 00000000..f842f470 --- /dev/null +++ b/adapters/item_legacy17/forge/java/marumasa/marumasa_sign/adapter/ForgeInstaller.java @@ -0,0 +1,21 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.init.Items; +import net.minecraftforge.client.MinecraftForgeClient; + +/** + * Forge 1.7.10 向けに看板アイテムのレンダラーを登録する。 + */ +public final class ForgeInstaller { + + private static boolean installed; + + private ForgeInstaller() { + } + + public static void install() { + if (installed) return; + MinecraftForgeClient.registerItemRenderer(Items.sign, new ForgeItemSignRenderer()); + installed = true; + } +} diff --git a/adapters/item_legacy17/forge/java/marumasa/marumasa_sign/adapter/ForgeItemSignRenderer.java b/adapters/item_legacy17/forge/java/marumasa/marumasa_sign/adapter/ForgeItemSignRenderer.java new file mode 100644 index 00000000..a22f49c9 --- /dev/null +++ b/adapters/item_legacy17/forge/java/marumasa/marumasa_sign/adapter/ForgeItemSignRenderer.java @@ -0,0 +1,47 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +/** + * Forge 1.7.10 向けの看板アイテムレンダラー。 + */ +final class ForgeItemSignRenderer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + // MarumaSign の看板アイテムでなければ false を返し、Forge の標準描画に任せる + return ItemSignFinder.find(item) != null; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + // 地面に落ちたアイテムの回転と浮遊は有効にする + if (helper == ItemRendererHelper.ENTITY_ROTATION) return true; + if (helper == ItemRendererHelper.ENTITY_BOBBING) return true; + // 看板と同じ平らなアイテムとして描くため、ブロック用の変換ヘルパーは使わない + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + final SignImage image = ItemSignFinder.find(item); + if (image == null) return; + + switch (type) { + case INVENTORY: + SignItemDraw.drawInGui(image, 0.0f, 0.0f, 0.0f); + break; + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + SignItemDraw.drawEquipped(image); + break; + case ENTITY: + SignItemDraw.drawEntity(image); + break; + default: + break; + } + } +} diff --git a/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/ItemSignFinder.java b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/ItemSignFinder.java new file mode 100644 index 00000000..e508dd89 --- /dev/null +++ b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/ItemSignFinder.java @@ -0,0 +1,49 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.item.ItemSign; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagString; + +/** + * 看板アイテムのデータから MarumaSign の画像を判定・取得する。 + */ +final class ItemSignFinder { + + private ItemSignFinder() { + } + + /** + * 看板アイテムに対応する画像を返す。MarumaSign の看板でなければ null。 + */ + static SignImage find(ItemStack stack) { + if (stack == null) return null; + if (!(stack.getItem() instanceof ItemSign)) return null; + + final NBTTagCompound tag = stack.getTagCompound(); + if (tag == null) return null; + + // 1.7.10 では Ctrl+選択による BlockEntityTag は標準では存在しないが、 + // /give や Mod 等で BlockEntityTag または直下に看板テキストが設定される場合がある + final NBTTagCompound blockEntityTag = tag.hasKey("BlockEntityTag", 10) ? tag.getCompoundTag("BlockEntityTag") : tag; + if (!blockEntityTag.hasKey("Text1")) return null; + + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) { + lines[i] = readLine(blockEntityTag, "Text" + (i + 1)); + } + return MarumaSign.itemSign(lines); + } + + private static String readLine(NBTTagCompound tag, String key) { + if (!tag.hasKey(key)) return ""; + final NBTBase base = tag.getTag(key); + if (base instanceof NBTTagString) { + return ((NBTTagString) base).getString(); + } + return base != null ? base.toString() : ""; + } +} diff --git a/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/SignItemDraw.java b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/SignItemDraw.java new file mode 100644 index 00000000..991515c1 --- /dev/null +++ b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/SignItemDraw.java @@ -0,0 +1,58 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import org.lwjgl.opengl.GL11; + +/** + * 看板アイテムの画像や 3D モデルを各場面の OpenGL 座標系に描く。 + */ +final class SignItemDraw { + + private SignItemDraw() { + } + + /** + * インベントリやホットバー枠 (GUI) に描く。 + * 16x16 ピクセルの枠の中央に、上下正しく収まるように描く。 + */ + static void drawInGui(SignImage image, float x, float y, float zLevel) { + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_POLYGON_BIT); + GL11.glTranslatef(x + 8.0f, y + 8.0f, zLevel); + // GUI は上が -Y。itemBatches は上が +Y、正面が +Z なので、Y を反転して 16 倍にする + GL11.glScalef(16.0f, -16.0f, 16.0f); + // Y 軸反転によって面の巻き方向が CW になるため、3D モデルのカリングを正しくする + GL11.glFrontFace(GL11.GL_CW); + GL11.glTranslatef(-0.5f, -0.5f, -0.5f); + SignDraw.drawBatches(image.itemBatches(1.0)); + GL11.glPopAttrib(); + GL11.glPopMatrix(); + MarumaSign.drawn(image); + } + + /** + * 手に持ったとき (一人称・三人称) の位置に描く。 + * 看板と同じ変換が適用された座標系で、看板と同じ位置と向きに描く。 + */ + static void drawEquipped(SignImage image) { + GL11.glPushMatrix(); + // 看板アイテムの表面 (Z=0) と中心を合わせる + GL11.glTranslatef(0.0f, 0.0f, -0.5f); + SignDraw.drawBatches(image.itemBatches(1.0)); + GL11.glPopMatrix(); + MarumaSign.drawn(image); + } + + /** + * 地面に落ちているとき、または額縁の中央に描く。 + */ + static void drawEntity(SignImage image) { + GL11.glPushMatrix(); + // 立方体の中心 (0.5, 0.5, 0.5) を原点に合わせる + GL11.glTranslatef(-0.5f, -0.5f, -0.5f); + SignDraw.drawBatches(image.itemBatches(1.0)); + GL11.glPopMatrix(); + MarumaSign.drawn(image); + } +} diff --git a/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..1f9722c5 --- /dev/null +++ b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,22 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; + +/** + * 看板アイテムの見た目の差し替えの入口。毎 tick 呼ばれる。 + */ +public final class SignItems { + + // ローダーの仕組みで差し替えを済ませている場合は true (Forge)。そのときは、ここでは何もしない + public static boolean handledByLoader; + + private SignItems() { + } + + public static void install(Minecraft mc) { + if (handledByLoader) return; + // ローダーに仕組みがない場合 (LiteLoader) は、ゲームが持っているレンダラーを差し替える。 + // 元に戻されることがあるので、毎 tick 確認する + VanillaInstaller.install(mc); + } +} \ No newline at end of file diff --git a/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaInstaller.java b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaInstaller.java new file mode 100644 index 00000000..f79178e2 --- /dev/null +++ b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaInstaller.java @@ -0,0 +1,92 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiIngame; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.item.EntityItem; + +import java.lang.reflect.Field; +import java.util.Map; + +/** + * LiteLoader (Vanilla) 向けにゲームのフィールドや表を差し替える。 + */ +final class VanillaInstaller { + + private static VanillaRenderItem customRenderItem; + private static VanillaItemRenderer customItemRenderer; + + private static Field entityRenderMapField; + private static Field renderManagerItemRendererField; + private static Field entityRendererItemRendererField; + private static Field guiScreenItemRenderField; + private static Field guiIngameItemRendererField; + + private VanillaInstaller() { + } + + static void install(Minecraft mc) { + if (customRenderItem == null) { + customRenderItem = new VanillaRenderItem(); + customRenderItem.setRenderManager(RenderManager.instance); + } + if (customItemRenderer == null) { + customItemRenderer = new VanillaItemRenderer(mc); + } + + // 1. 地面および額縁のレンダラー (RenderManager の entityRenderMap) + final RenderManager renderManager = RenderManager.instance; + if (renderManager != null) { + if (entityRenderMapField == null) { + entityRenderMapField = Reflect.fieldOfType(RenderManager.class, Map.class); + } + final Map, Object> map = Reflect.get(entityRenderMapField, renderManager); + if (map != null && map.get(EntityItem.class) != customRenderItem) { + map.put(EntityItem.class, customRenderItem); + } + + // 2. 三人称手持ちのレンダラー (RenderManager の itemRenderer) + if (renderManagerItemRendererField == null) { + renderManagerItemRendererField = Reflect.fieldOfType(RenderManager.class, ItemRenderer.class); + } + if (Reflect.get(renderManagerItemRendererField, renderManager) != customItemRenderer) { + Reflect.set(renderManagerItemRendererField, renderManager, customItemRenderer); + } + } + + // 3. 一人称手持ちのレンダラー (EntityRenderer の itemRenderer) + if (mc.entityRenderer != null) { + if (entityRendererItemRendererField == null) { + entityRendererItemRendererField = Reflect.fieldOfType(EntityRenderer.class, ItemRenderer.class); + } + if (Reflect.get(entityRendererItemRendererField, mc.entityRenderer) != customItemRenderer) { + Reflect.set(entityRendererItemRendererField, mc.entityRenderer, customItemRenderer); + } + } + + // 4. GUI コンテナのレンダラー (GuiScreen の static itemRender) + if (guiScreenItemRenderField == null) { + guiScreenItemRenderField = Reflect.fieldOfType(GuiScreen.class, RenderItem.class); + } + if (Reflect.get(guiScreenItemRenderField, null) != customRenderItem) { + // このフィールドは書き換えられない指定 (static final) になっている + Reflect.setStaticFinal(guiScreenItemRenderField, customRenderItem); + } + + // 5. ホットバーのレンダラー (GuiIngame の itemRenderer) + if (mc.ingameGUI != null) { + if (guiIngameItemRendererField == null) { + guiIngameItemRendererField = Reflect.fieldOfType(GuiIngame.class, RenderItem.class); + } + if (Reflect.get(guiIngameItemRendererField, mc.ingameGUI) != customRenderItem) { + // このフィールドも書き換えられない指定 (static final) になっている + Reflect.setStaticFinal(guiIngameItemRendererField, customRenderItem); + } + } + } +} diff --git a/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaItemRenderer.java b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaItemRenderer.java new file mode 100644 index 00000000..4ee979a7 --- /dev/null +++ b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaItemRenderer.java @@ -0,0 +1,35 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; + +/** + * 手に持ったアイテムを描くレンダラー。MarumaSign の看板アイテムを差し替える。 + */ +final class VanillaItemRenderer extends ItemRenderer { + + VanillaItemRenderer(Minecraft mc) { + super(mc); + } + + @Override + public void renderItem(EntityLivingBase entity, ItemStack stack, int pass) { + final SignImage image = ItemSignFinder.find(stack); + if (image != null) { + GL11.glPushMatrix(); + // 看板アイテムと同じ手持ち変換 (スケール 1.5、回転、位置調整) を適用する + GL11.glScalef(1.5F, 1.5F, 1.5F); + GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); + SignItemDraw.drawEquipped(image); + GL11.glPopMatrix(); + return; + } + super.renderItem(entity, stack, pass); + } +} diff --git a/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaRenderItem.java b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaRenderItem.java new file mode 100644 index 00000000..f30fcbdd --- /dev/null +++ b/adapters/item_legacy17/main/java/marumasa/marumasa_sign/adapter/VanillaRenderItem.java @@ -0,0 +1,63 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +/** + * インベントリ枠や地面・額縁のアイテムを描くレンダラー。MarumaSign の看板アイテムを差し替える。 + */ +final class VanillaRenderItem extends RenderItem { + + @Override + public void renderItemIntoGUI(FontRenderer fr, TextureManager tm, ItemStack stack, int x, int y) { + final SignImage image = ItemSignFinder.find(stack); + if (image != null) { + SignItemDraw.drawInGui(image, x, y, this.zLevel); + return; + } + super.renderItemIntoGUI(fr, tm, stack, x, y); + } + + @Override + public void renderItemAndEffectIntoGUI(FontRenderer fr, TextureManager tm, ItemStack stack, int x, int y) { + final SignImage image = ItemSignFinder.find(stack); + if (image != null) { + SignItemDraw.drawInGui(image, x, y, this.zLevel); + return; + } + super.renderItemAndEffectIntoGUI(fr, tm, stack, x, y); + } + + @Override + public void doRender(EntityItem entityItem, double x, double y, double z, float yaw, float partialTicks) { + final ItemStack stack = entityItem.getEntityItem(); + final SignImage image = ItemSignFinder.find(stack); + if (image != null) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + if (RenderItem.renderInFrame) { + // 額縁内の変換 (0.5128205 倍、下へ 0.05 移動、正面を向くよう 180 度回転) + GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + } else { + // 地面に落ちているアイテムの変換 (0.5 倍、時間経過による Y 軸回転) + final float rotation = ((float) entityItem.age + partialTicks) / 20.0F + entityItem.hoverStart; + GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(rotation * 57.295776F, 0.0F, 1.0F, 0.0F); + } + SignItemDraw.drawEntity(image); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + return; + } + super.doRender(entityItem, x, y, z, yaw, partialTicks); + } +} diff --git a/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItemModelMesher.java b/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItemModelMesher.java new file mode 100644 index 00000000..b2fb1ee7 --- /dev/null +++ b/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItemModelMesher.java @@ -0,0 +1,93 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + + +/** + * 看板アイテムのモデル取得を差し替える Mesher。 + * MarumaSign のデータを持つ看板アイテムに対して、TileEntityItemStackRenderer 経由で描画させるモデルを返す。 + */ +final class SignItemModelMesher extends ItemModelMesher { + + private final ItemModelMesher original; + private IBakedModel signModel; + private IBakedModel cachedBaseModel; + + SignItemModelMesher(ItemModelMesher original) { + super(original.getModelManager()); + this.original = original; + } + + @Override + public IBakedModel getItemModel(ItemStack stack) { + if (stack != null && SignItems.isSign(stack.getItem())) { + final SignImage sign = SignItems.find(stack); + if (sign != null) { + return getSignModel(); + } + } + return original.getItemModel(stack); + } + + // 専用の描画に回すためのモデルを返す。手に持ったときなどの位置と向きは、通常の看板のモデルと同じにする + private IBakedModel getSignModel() { + IBakedModel base = original.getItemModel(new ItemStack(Items.sign)); + if (base == null) { + base = getModelManager().getMissingModel(); + } + if (signModel == null || cachedBaseModel != base) { + cachedBaseModel = base; + // 専用の描画に回すモデルは、枠の中でブロックのように斜めから見た向きになる。 + // 看板のアイテムは平らな絵なので、正面から見た向きのままにする + signModel = new BuiltInModel(base.getItemCameraTransforms()) { + @Override + public boolean isGui3d() { + return false; + } + }; + } + return signModel; + } + + @Override + public TextureAtlasSprite getParticleIcon(Item item) { + return original.getParticleIcon(item); + } + + @Override + public TextureAtlasSprite getParticleIcon(Item item, int meta) { + return original.getParticleIcon(item, meta); + } + + @Override + public void register(Item item, int meta, ModelResourceLocation location) { + original.register(item, meta, location); + } + + @Override + public void register(Item item, ItemMeshDefinition definition) { + original.register(item, definition); + } + + @Override + public ModelManager getModelManager() { + return original.getModelManager(); + } + + @Override + public void rebuildCache() { + original.rebuildCache(); + signModel = null; + cachedBaseModel = null; + } +} diff --git a/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItemStackRenderer.java b/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItemStackRenderer.java new file mode 100644 index 00000000..e2c3b0ed --- /dev/null +++ b/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItemStackRenderer.java @@ -0,0 +1,33 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; +import net.minecraft.item.ItemStack; + +/** + * 看板アイテムの描画を行う TileEntityItemStackRenderer のラッパー。 + */ +final class SignItemStackRenderer extends TileEntityItemStackRenderer { + + private final TileEntityItemStackRenderer parent; + + SignItemStackRenderer(TileEntityItemStackRenderer parent) { + this.parent = parent; + } + + @Override + public void renderByItem(ItemStack stack) { + if (stack != null && SignItems.isSign(stack.getItem())) { + final SignImage sign = SignItems.find(stack); + if (sign != null) { + SignItems.drawItem(sign); + return; + } + } + if (parent != null) { + parent.renderByItem(stack); + } else { + super.renderByItem(stack); + } + } +} diff --git a/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..0a3bdeec --- /dev/null +++ b/adapters/item_mesher/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,111 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemSign; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagString; +import org.lwjgl.opengl.GL11; + +import java.lang.reflect.Field; + +/** + * 看板アイテムの見た目を看板と同じ表示にするための管理クラス。 + * 毎 tick 呼ばれ、レンダラーの差し替えを行う。 + */ +final class SignItems { + + private static Field itemModelMesherField; + + private SignItems() { + } + + static void install() { + install(Minecraft.getMinecraft()); + } + + static void install(Minecraft mc) { + if (mc == null) return; + final RenderItem renderItem = mc.getRenderItem(); + if (renderItem == null) return; + + // 1. ItemModelMesher の差し替え + final ItemModelMesher currentMesher = renderItem.getItemModelMesher(); + if (!(currentMesher instanceof SignItemModelMesher)) { + if (itemModelMesherField == null) { + itemModelMesherField = Reflect.fieldOfType(RenderItem.class, ItemModelMesher.class); + } + Reflect.set(itemModelMesherField, renderItem, new SignItemModelMesher(currentMesher)); + } + + // 2. TileEntityItemStackRenderer の差し替え + if (!(TileEntityItemStackRenderer.instance instanceof SignItemStackRenderer)) { + TileEntityItemStackRenderer.instance = new SignItemStackRenderer(TileEntityItemStackRenderer.instance); + } + } + + static boolean isSign(Item item) { + return item instanceof ItemSign || item == Items.sign; + } + + // アイテムから看板の文字を取り出し、MarumaSign の看板なら画像を返す + static SignImage find(ItemStack stack) { + if (stack == null) return null; + final NBTTagCompound root = stack.getTagCompound(); + if (root == null) return null; + + final NBTTagCompound tag; + if (root.hasKey("BlockEntityTag", 10)) { + tag = root.getCompoundTag("BlockEntityTag"); + } else { + tag = root; + } + + boolean hasText = false; + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) { + final String key = "Text" + (i + 1); + if (tag.hasKey(key)) { + hasText = true; + final NBTBase base = tag.getTag(key); + if (base instanceof NBTTagString) { + lines[i] = ((NBTTagString) base).getString(); + } else if (base != null) { + lines[i] = base.toString(); + } else { + lines[i] = ""; + } + } else { + lines[i] = ""; + } + } + if (!hasText) return null; + return MarumaSign.itemSign(lines); + } + + // 四角形のまとまりを描く + static void drawItem(SignImage sign) { + final SignImage.Batch[] batches = sign.itemBatches(1.0); + if (batches == null || batches.length == 0) return; + + GL11.glPushMatrix(); + // TileEntityItemStackRenderer 呼び出し時の 180 度回転を相殺し、通常の flat アイテムモデルと同じ座標系にする + GL11.glTranslated(0.5, 0.5, 0.5); + GL11.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); + GL11.glTranslated(-0.5, -0.5, -0.5); + + SignDraw.drawBatches(batches); + GL11.glPopMatrix(); + + MarumaSign.drawn(sign); + } +} diff --git a/adapters/item_model_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_model_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..fec94059 --- /dev/null +++ b/adapters/item_model_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,181 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.client.renderer.special.SpecialModelRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.21.4) + * アイテムのモデルの表にある看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ描き方を差し替える。 + */ +final class SignItems { + + private static Field modelsField; + private static Field layersField; + private static Field layerCountField; + private static Field layerModelField; + + private SignItems() { + } + + // 看板アイテムのモデルがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + static void install(Minecraft mc) { + // アイテムの情報は、ワールドに入るまで読めないバージョンがある + if (mc.level == null) return; + final ModelManager manager = mc.getModelManager(); + if (manager == null) return; + + // 看板アイテムと、そのモデルの名前 + final List ids = new ArrayList(); + for (Item item : BuiltInRegistries.ITEM) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) continue; + final Object id = new ItemStack(item).get(DataComponents.ITEM_MODEL); + if (id != null) ids.add(id); + } + if (ids.isEmpty()) return; + + if (modelsField == null) { + // アイテムのモデルの表は、同じ型のフィールドがほかにもあるので、中身で見分ける + for (Field field : ModelManager.class.getDeclaredFields()) { + if (!Map.class.isAssignableFrom(field.getType())) continue; + field.setAccessible(true); + final Map map = Reflect.get(field, manager); + if (map != null && map.get(ids.get(0)) instanceof ItemModel) { + modelsField = field; + break; + } + } + // まだモデルが読み込まれていない + if (modelsField == null) return; + } + + final Map models = Reflect.get(modelsField, manager); + if (models == null) return; + boolean wrapped = true; + for (Object id : ids) { + final ItemModel model = models.get(id); + if (model != null && !(model instanceof Model)) wrapped = false; + } + if (wrapped) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map replaced = new HashMap(models); + for (Object id : ids) { + final ItemModel model = replaced.get(id); + if (model != null && !(model instanceof Model)) replaced.put(id, new Model(model)); + } + Reflect.set(modelsField, manager, replaced); + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + final CustomData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (data == null) return null; + final CompoundTag tag = data.getUnsafe(); + final String[] lines = new String[8]; + readLines(tag.getCompound("front_text"), lines, 0); + readLines(tag.getCompound("back_text"), lines, 4); + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + final ListTag messages = text.getList("messages", Tag.TAG_STRING); + for (int i = 0; i < 4 && i < messages.size(); i++) { + lines[offset + i] = messages.getString(i); + } + } + + /** + * 看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ、中身を画像に差し替える。 + */ + private static final class Model implements ItemModel { + + private final ItemModel delegate; + + Model(ItemModel delegate) { + this.delegate = delegate; + } + + @Override + public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, + ClientLevel level, LivingEntity entity, int seed) { + final SignImage image = find(stack); + if (image == null) { + delegate.update(state, stack, resolver, context, level, entity, seed); + return; + } + + // 元のモデルに層を作らせて、手に持ったときや枠の中での位置と向きをそのまま使う + if (layersField == null) { + layersField = Reflect.fieldOfType(ItemStackRenderState.class, ItemStackRenderState.LayerRenderState[].class); + layerCountField = Reflect.fieldOfType(ItemStackRenderState.class, int.class); + } + final int before = Reflect.get(layerCountField, state); + delegate.update(state, stack, resolver, context, level, entity, seed); + final int after = Reflect.get(layerCountField, state); + final ItemStackRenderState.LayerRenderState[] layers = Reflect.get(layersField, state); + + if (after > before) { + // 元の絵 (板の形) は描かず、最初の層で画像を描く。位置と向きは、元のモデルのものを使う + if (layerModelField == null) layerModelField = Reflect.fieldOfType(ItemStackRenderState.LayerRenderState.class, BakedModel.class); + final BakedModel model = Reflect.get(layerModelField, layers[before]); + layers[before].setupSpecialModel(Renderer.INSTANCE, image, model); + // 残りの層には何も描かせない + for (int i = before + 1; i < after; i++) layers[i].setupSpecialModel(Renderer.INSTANCE, null, model); + } + } + } + + /** + * 画像を描く部分。 + */ + private static final class Renderer implements SpecialModelRenderer { + + static final Renderer INSTANCE = new Renderer(); + + @Override + public void render(SignImage image, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay, boolean foil) { + if (image == null) return; + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + @Override + public SignImage extractArgument(ItemStack stack) { + return find(stack); + } + } +} diff --git a/adapters/item_model_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_model_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..80ce808f --- /dev/null +++ b/adapters/item_model_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,181 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.client.renderer.special.SpecialModelRenderer; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.nbt.Tag; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.21.5) + * アイテムのモデルの表にある看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ描き方を差し替える。 + */ +final class SignItems { + + private static Field modelsField; + private static Field layersField; + private static Field layerCountField; + + private SignItems() { + } + + // 看板アイテムのモデルがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + static void install(Minecraft mc) { + // アイテムの情報は、ワールドに入るまで読めないバージョンがある + if (mc.level == null) return; + final ModelManager manager = mc.getModelManager(); + if (manager == null) return; + + // 看板アイテムと、そのモデルの名前 + final List ids = new ArrayList(); + for (Item item : BuiltInRegistries.ITEM) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) continue; + final Object id = new ItemStack(item).get(DataComponents.ITEM_MODEL); + if (id != null) ids.add(id); + } + if (ids.isEmpty()) return; + + if (modelsField == null) { + // アイテムのモデルの表は、同じ型のフィールドがほかにもあるので、中身で見分ける + for (Field field : ModelManager.class.getDeclaredFields()) { + if (!Map.class.isAssignableFrom(field.getType())) continue; + field.setAccessible(true); + final Map map = Reflect.get(field, manager); + if (map != null && map.get(ids.get(0)) instanceof ItemModel) { + modelsField = field; + break; + } + } + // まだモデルが読み込まれていない + if (modelsField == null) return; + } + + final Map models = Reflect.get(modelsField, manager); + if (models == null) return; + boolean wrapped = true; + for (Object id : ids) { + final ItemModel model = models.get(id); + if (model != null && !(model instanceof Model)) wrapped = false; + } + if (wrapped) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map replaced = new HashMap(models); + for (Object id : ids) { + final ItemModel model = replaced.get(id); + if (model != null && !(model instanceof Model)) replaced.put(id, new Model(model)); + } + Reflect.set(modelsField, manager, replaced); + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + final CustomData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (data == null) return null; + final CompoundTag tag = data.getUnsafe(); + final String[] lines = new String[8]; + readLines(tag.getCompoundOrEmpty("front_text"), lines, 0); + readLines(tag.getCompoundOrEmpty("back_text"), lines, 4); + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + final ListTag messages = text.getListOrEmpty("messages"); + for (int i = 0; i < 4 && i < messages.size(); i++) { + final Tag message = messages.get(i); + // 文字だけの行は文字列で、装飾のある行は複合タグで保存されている + lines[offset + i] = message instanceof StringTag ? ((StringTag) message).value() : String.valueOf(message); + } + } + + /** + * 看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ、中身を画像に差し替える。 + */ + private static final class Model implements ItemModel { + + private final ItemModel delegate; + + Model(ItemModel delegate) { + this.delegate = delegate; + } + + @Override + public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, + ClientLevel level, LivingEntity entity, int seed) { + final SignImage image = find(stack); + if (image == null) { + delegate.update(state, stack, resolver, context, level, entity, seed); + return; + } + + // 元のモデルに層を作らせて、手に持ったときや枠の中での位置と向きをそのまま使う + if (layersField == null) { + layersField = Reflect.fieldOfType(ItemStackRenderState.class, ItemStackRenderState.LayerRenderState[].class); + layerCountField = Reflect.fieldOfType(ItemStackRenderState.class, int.class); + } + final int before = Reflect.get(layerCountField, state); + delegate.update(state, stack, resolver, context, level, entity, seed); + final int after = Reflect.get(layerCountField, state); + final ItemStackRenderState.LayerRenderState[] layers = Reflect.get(layersField, state); + + if (after > before) { + // 元の絵 (板の形) は描かず、最初の層で画像を描く。残りの層には何も描かせない + layers[before].setupSpecialModel(Renderer.INSTANCE, image); + for (int i = before + 1; i < after; i++) layers[i].setupSpecialModel(Renderer.INSTANCE, null); + } else { + state.newLayer().setupSpecialModel(Renderer.INSTANCE, image); + } + } + } + + /** + * 画像を描く部分。 + */ + private static final class Renderer implements SpecialModelRenderer { + + static final Renderer INSTANCE = new Renderer(); + + @Override + public void render(SignImage image, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay, boolean foil) { + if (image == null) return; + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + @Override + public SignImage extractArgument(ItemStack stack) { + return find(stack); + } + } +} diff --git a/adapters/item_model_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_model_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..7fe709dd --- /dev/null +++ b/adapters/item_model_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,193 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.client.renderer.special.SpecialModelRenderer; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.nbt.Tag; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.block.StandingSignBlock; +import org.joml.Vector3f; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.21.6 - 1.21.8) + * アイテムのモデルの表にある看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ描き方を差し替える。 + */ +final class SignItems { + + private static Field modelsField; + private static Field layersField; + private static Field layerCountField; + + private SignItems() { + } + + // 看板アイテムのモデルがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + static void install(Minecraft mc) { + // アイテムの情報は、ワールドに入るまで読めないバージョンがある + if (mc.level == null) return; + final ModelManager manager = mc.getModelManager(); + if (manager == null) return; + + // 看板アイテムと、そのモデルの名前 + final List ids = new ArrayList(); + for (Item item : BuiltInRegistries.ITEM) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) continue; + final Object id = new ItemStack(item).get(DataComponents.ITEM_MODEL); + if (id != null) ids.add(id); + } + if (ids.isEmpty()) return; + + if (modelsField == null) { + // アイテムのモデルの表は、同じ型のフィールドがほかにもあるので、中身で見分ける + for (Field field : ModelManager.class.getDeclaredFields()) { + if (!Map.class.isAssignableFrom(field.getType())) continue; + field.setAccessible(true); + final Map map = Reflect.get(field, manager); + if (map != null && map.get(ids.get(0)) instanceof ItemModel) { + modelsField = field; + break; + } + } + // まだモデルが読み込まれていない + if (modelsField == null) return; + } + + final Map models = Reflect.get(modelsField, manager); + if (models == null) return; + boolean wrapped = true; + for (Object id : ids) { + final ItemModel model = models.get(id); + if (model != null && !(model instanceof Model)) wrapped = false; + } + if (wrapped) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map replaced = new HashMap(models); + for (Object id : ids) { + final ItemModel model = replaced.get(id); + if (model != null && !(model instanceof Model)) replaced.put(id, new Model(model)); + } + Reflect.set(modelsField, manager, replaced); + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + final CustomData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (data == null) return null; + final CompoundTag tag = data.getUnsafe(); + final String[] lines = new String[8]; + readLines(tag.getCompoundOrEmpty("front_text"), lines, 0); + readLines(tag.getCompoundOrEmpty("back_text"), lines, 4); + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + final ListTag messages = text.getListOrEmpty("messages"); + for (int i = 0; i < 4 && i < messages.size(); i++) { + final Tag message = messages.get(i); + // 文字だけの行は文字列で、装飾のある行は複合タグで保存されている + lines[offset + i] = message instanceof StringTag ? ((StringTag) message).value() : String.valueOf(message); + } + } + + /** + * 看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ、中身を画像に差し替える。 + */ + private static final class Model implements ItemModel { + + private final ItemModel delegate; + + Model(ItemModel delegate) { + this.delegate = delegate; + } + + @Override + public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, + ClientLevel level, LivingEntity entity, int seed) { + final SignImage image = find(stack); + if (image == null) { + delegate.update(state, stack, resolver, context, level, entity, seed); + return; + } + + // 元のモデルに層を作らせて、手に持ったときや枠の中での位置と向きをそのまま使う + if (layersField == null) { + layersField = Reflect.fieldOfType(ItemStackRenderState.class, ItemStackRenderState.LayerRenderState[].class); + layerCountField = Reflect.fieldOfType(ItemStackRenderState.class, int.class); + } + final int before = Reflect.get(layerCountField, state); + delegate.update(state, stack, resolver, context, level, entity, seed); + final int after = Reflect.get(layerCountField, state); + final ItemStackRenderState.LayerRenderState[] layers = Reflect.get(layersField, state); + + if (after > before) { + // 元の絵 (板の形) は描かず、最初の層で画像を描く。残りの層には何も描かせない + layers[before].setupSpecialModel(Renderer.INSTANCE, image); + for (int i = before + 1; i < after; i++) layers[i].setupSpecialModel(Renderer.INSTANCE, null); + } else { + state.newLayer().setupSpecialModel(Renderer.INSTANCE, image); + } + // 動画などで内容が変わるので、枠の中の絵を使い回さず毎回描き直してもらう + state.appendModelIdentityElement(image); + state.setAnimated(); + } + } + + /** + * 画像を描く部分。 + */ + private static final class Renderer implements SpecialModelRenderer { + + static final Renderer INSTANCE = new Renderer(); + + @Override + public void render(SignImage image, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay, boolean foil) { + if (image == null) return; + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + // アイテムが占める範囲。一辺 1 の立方体の中に収まる + @Override + public void getExtents(Set output) { + output.add(new Vector3f(0f, 0f, 0f)); + output.add(new Vector3f(1f, 1f, 1f)); + } + + @Override + public SignImage extractArgument(ItemStack stack) { + return find(stack); + } + } +} diff --git a/adapters/item_nbt/main/java/marumasa/marumasa_sign/adapter/SignItemData.java b/adapters/item_nbt/main/java/marumasa/marumasa_sign/adapter/SignItemData.java new file mode 100644 index 00000000..14356ed0 --- /dev/null +++ b/adapters/item_nbt/main/java/marumasa/marumasa_sign/adapter/SignItemData.java @@ -0,0 +1,20 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; + +/** + * アイテムが持っているブロックエンティティのデータ。(Minecraft 1.20.4 まで: アイテムのタグの中にある) + */ +final class SignItemData { + + private SignItemData() { + } + + // データがなければ null + static CompoundTag blockEntityTag(ItemStack stack) { + final CompoundTag tag = stack.getTag(); + // 10 は複合タグの種類 + return tag != null && tag.contains("BlockEntityTag", 10) ? tag.getCompound("BlockEntityTag") : null; + } +} diff --git a/adapters/item_render/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_render/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..c7da0405 --- /dev/null +++ b/adapters/item_render/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,100 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagString; + +import java.lang.reflect.Field; +import java.util.Map; + +/** + * 看板アイテムの見た目を差し替える。 + * ゲームがアイテムを描画する共通の RenderItem をラップし、看板の文字に応じた見た目に差し替える。 + */ +final class SignItems { + + private SignItems() { + } + + // 毎 tick 呼ばれ、RenderItem が差し替えられていなければ差し込む + static void install(Minecraft mc) { + final RenderItem current = mc.getRenderItem(); + if (current instanceof SignRenderItem) return; + + final SignRenderItem custom = new SignRenderItem(mc, current); + + // 1. mc.renderItem を差し替える (GUI などの共通経路) + replaceField(mc, current, custom); + + // 手持ちの枠 (ホットバー) と、開いている画面 + replaceField(mc.ingameGUI, current, custom); + replaceField(mc.currentScreen, current, custom); + + // 2. ItemRenderer.itemRenderer を差し替える (手持ちアイテムの描画) + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer != null) { + replaceField(itemRenderer, current, custom); + } + + // 3. RenderManager 以下のエンティティレンダラー (地面のドロップアイテム、額縁など) + final RenderManager renderManager = mc.getRenderManager(); + if (renderManager != null) { + replaceField(renderManager, current, custom); + final Field renderMapField = Reflect.fieldOfType(RenderManager.class, Map.class); + final Map map = Reflect.get(renderMapField, renderManager); + if (map != null) { + for (Object renderer : map.values()) { + replaceField(renderer, current, custom); + } + } + } + } + + // instance のフィールドのうち、oldValue を保持しているものを newValue に書き換える + private static void replaceField(Object instance, Object oldValue, Object newValue) { + if (instance == null) return; + for (Class type = instance.getClass(); type != null && type != Object.class; type = type.getSuperclass()) { + for (Field field : type.getDeclaredFields()) { + if (java.lang.reflect.Modifier.isStatic(field.getModifiers()) || field.getType().isPrimitive()) continue; + field.setAccessible(true); + try { + if (field.get(instance) == oldValue) { + field.set(instance, newValue); + } + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } + } + } + } + + // 看板アイテムから MarumaSign の画像を読み取る。MarumaSign でなければ null + static SignImage find(ItemStack stack) { + if (stack == null || stack.getItem() != Items.SIGN) return null; + if (!stack.hasTagCompound()) return null; + final NBTTagCompound tag = stack.getTagCompound(); + if (!tag.hasKey("BlockEntityTag", 10)) return null; + final NBTTagCompound bet = tag.getCompoundTag("BlockEntityTag"); + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) { + final NBTBase lineTag = bet.getTag("Text" + (i + 1)); + if (lineTag instanceof NBTTagString) { + lines[i] = ((NBTTagString) lineTag).getString(); + } else if (lineTag != null) { + lines[i] = lineTag.toString(); + } else { + lines[i] = ""; + } + } + return MarumaSign.itemSign(lines); + } +} diff --git a/adapters/item_render/main/java/marumasa/marumasa_sign/adapter/SignRenderItem.java b/adapters/item_render/main/java/marumasa/marumasa_sign/adapter/SignRenderItem.java new file mode 100644 index 00000000..bf9ca214 --- /dev/null +++ b/adapters/item_render/main/java/marumasa/marumasa_sign/adapter/SignRenderItem.java @@ -0,0 +1,42 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.color.ItemColors; +import net.minecraft.item.ItemStack; + +/** + * 看板アイテムの描画を横取りする RenderItem。 + * バニラの描画変換 (GUI、手持ち、ドロップ、額縁) が適用されたあと、看板の文字に応じた画像を描く。 + */ +final class SignRenderItem extends RenderItem { + + SignRenderItem(Minecraft mc, RenderItem original) { + super(mc.getTextureManager(), + original.getItemModelMesher().getModelManager(), + Reflect.get(Reflect.fieldOfType(RenderItem.class, ItemColors.class), original)); + // original が持っている ItemModelMesher (Forge の ItemModelMesherForge など) をそのまま引き継ぐ + Reflect.set(Reflect.fieldOfType(RenderItem.class, ItemModelMesher.class), this, original.getItemModelMesher()); + } + + @Override + public void renderItem(ItemStack stack, IBakedModel model) { + final SignImage image = SignItems.find(stack); + if (image != null) { + GlStateManager.pushMatrix(); + // 一辺 1 の立方体 (0 - 1) の中央を中心にする + GlStateManager.translate(-0.5f, -0.5f, -0.5f); + SignDraw.drawBatches(image.itemBatches(1.0)); + GlStateManager.popMatrix(); + MarumaSign.drawn(image); + return; + } + super.renderItem(stack, model); + } +} diff --git a/adapters/item_static_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_static_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..895dc167 --- /dev/null +++ b/adapters/item_static_1/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,144 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EntityBlockRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.14 - 1.14.4) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems { + + private static Field shaperField; + private static Field rendererField; + + private SignItems() { + } + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) { + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + // 専用の描画を行う部分は、ゲーム全体で 1 つだけあり、書き換えられないフィールドに入っている + if (rendererField == null) { + rendererField = Reflect.fieldOfType(EntityBlockRenderer.class, EntityBlockRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + } + final EntityBlockRenderer renderer = Reflect.get(rendererField, null); + if (renderer != null && !(renderer instanceof Renderer)) { + Reflect.setStaticFinal(rendererField, new Renderer(renderer)); + } + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) { + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + } + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + // 立て看板になるアイテムだけを対象にする + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) { + lines[i] = tag.getString("Text" + (i + 1)); + } + return MarumaSign.itemSign(lines); + } + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper { + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) { + super(mc.getModelManager()); + this.delegate = delegate; + } + + @Override + public BakedModel getItemModel(ItemStack stack) { + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) { + replaced = new BuiltInModel(model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon()); + builtIn.put(model, replaced); + } + return replaced; + } + + @Override + public BakedModel getItemModel(Item item) { + return delegate.getItemModel(item); + } + + @Override + public ModelManager getModelManager() { + return delegate.getModelManager(); + } + + @Override + public void register(Item item, ModelResourceLocation location) { + delegate.register(item, location); + } + + @Override + public void rebuildCache() { + delegate.rebuildCache(); + builtIn.clear(); + } + } + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends EntityBlockRenderer { + + private final EntityBlockRenderer delegate; + + Renderer(EntityBlockRenderer delegate) { + this.delegate = delegate; + } + + @Override + public void renderByItem(ItemStack stack) { + final SignImage image = find(stack); + if (image == null) { + delegate.renderByItem(stack); + return; + } + // 距離は分からないので、手元にあるものとして扱う + SignRendererBase.drawBatches(image.itemBatches(1.0)); + MarumaSign.drawn(image); + } + } +} diff --git a/adapters/item_static_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_static_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..affe6989 --- /dev/null +++ b/adapters/item_static_2/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,149 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.15 - 1.15.2) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems { + + private static Field shaperField; + private static Field rendererField; + + private SignItems() { + } + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) { + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + // 専用の描画を行う部分は、ゲーム全体で 1 つだけあり、書き換えられないフィールドに入っている + if (rendererField == null) { + rendererField = Reflect.fieldOfType(BlockEntityWithoutLevelRenderer.class, BlockEntityWithoutLevelRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + } + final BlockEntityWithoutLevelRenderer renderer = Reflect.get(rendererField, null); + if (renderer != null && !(renderer instanceof Renderer)) { + Reflect.setStaticFinal(rendererField, new Renderer(renderer)); + } + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) { + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + } + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + // 立て看板になるアイテムだけを対象にする + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) { + lines[i] = tag.getString("Text" + (i + 1)); + } + return MarumaSign.itemSign(lines); + } + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper { + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) { + super(mc.getModelManager()); + this.delegate = delegate; + } + + @Override + public BakedModel getItemModel(ItemStack stack) { + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) { + replaced = Reflect.construct(BuiltInModel.class, model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon(), Boolean.FALSE); + if (replaced == null) replaced = Reflect.construct(BuiltInModel.class, model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon()); + builtIn.put(model, replaced); + } + return replaced; + } + + @Override + public BakedModel getItemModel(Item item) { + return delegate.getItemModel(item); + } + + @Override + public ModelManager getModelManager() { + return delegate.getModelManager(); + } + + @Override + public void register(Item item, ModelResourceLocation location) { + delegate.register(item, location); + } + + @Override + public void rebuildCache() { + delegate.rebuildCache(); + builtIn.clear(); + } + } + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends BlockEntityWithoutLevelRenderer { + + private final BlockEntityWithoutLevelRenderer delegate; + + Renderer(BlockEntityWithoutLevelRenderer delegate) { + this.delegate = delegate; + } + + @Override + public void renderByItem(ItemStack stack, PoseStack poseStack, MultiBufferSource buffers, int light, int overlay) { + final SignImage image = find(stack); + if (image == null) { + delegate.renderByItem(stack, poseStack, buffers, light, overlay); + return; + } + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + } +} diff --git a/adapters/item_static_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/item_static_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..b1374f82 --- /dev/null +++ b/adapters/item_static_3/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,149 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。(Minecraft 1.16 - 1.16.5) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems { + + private static Field shaperField; + private static Field rendererField; + + private SignItems() { + } + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) { + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + // 専用の描画を行う部分は、ゲーム全体で 1 つだけあり、書き換えられないフィールドに入っている + if (rendererField == null) { + rendererField = Reflect.fieldOfType(BlockEntityWithoutLevelRenderer.class, BlockEntityWithoutLevelRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + } + final BlockEntityWithoutLevelRenderer renderer = Reflect.get(rendererField, null); + if (renderer != null && !(renderer instanceof Renderer)) { + Reflect.setStaticFinal(rendererField, new Renderer(renderer)); + } + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) { + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + } + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + // 立て看板になるアイテムだけを対象にする + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) { + lines[i] = tag.getString("Text" + (i + 1)); + } + return MarumaSign.itemSign(lines); + } + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper { + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) { + super(mc.getModelManager()); + this.delegate = delegate; + } + + @Override + public BakedModel getItemModel(ItemStack stack) { + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) { + replaced = new BuiltInModel(model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon(), model.usesBlockLight()); + builtIn.put(model, replaced); + } + return replaced; + } + + @Override + public BakedModel getItemModel(Item item) { + return delegate.getItemModel(item); + } + + @Override + public ModelManager getModelManager() { + return delegate.getModelManager(); + } + + @Override + public void register(Item item, ModelResourceLocation location) { + delegate.register(item, location); + } + + @Override + public void rebuildCache() { + delegate.rebuildCache(); + builtIn.clear(); + } + } + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends BlockEntityWithoutLevelRenderer { + + private final BlockEntityWithoutLevelRenderer delegate; + + Renderer(BlockEntityWithoutLevelRenderer delegate) { + this.delegate = delegate; + } + + @Override + public void renderByItem(ItemStack stack, ItemTransforms.TransformType context, PoseStack poseStack, MultiBufferSource buffers, int light, int overlay) { + final SignImage image = find(stack); + if (image == null) { + delegate.renderByItem(stack, context, poseStack, buffers, light, overlay); + return; + } + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + } +} diff --git a/adapters/legacy/forge/java/marumasa/marumasa_sign/adapter/Entry.java b/adapters/legacy/forge/java/marumasa/marumasa_sign/adapter/Entry.java new file mode 100644 index 00000000..eed3148d --- /dev/null +++ b/adapters/legacy/forge/java/marumasa/marumasa_sign/adapter/Entry.java @@ -0,0 +1,34 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.relauncher.Side; + +/** + * Forge 1.8 - 1.12.2 から起動されたときの入口。 + */ +public final class Entry { + + public static void start() { + // クライアント専用 + if (FMLCommonHandler.instance().getSide() != Side.CLIENT) return; + if (!Adapter.init("forge")) return; + // 古いバージョンでは tick のイベントが FML のバスに流れる。同じバスなら 2 回目の登録は無視される + final Entry entry = new Entry(); + MinecraftForge.EVENT_BUS.register(entry); + FMLCommonHandler.instance().bus().register(entry); + } + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase == TickEvent.Phase.END) Adapter.tick(); + } + + @SubscribeEvent + public void onRenderWorldLast(RenderWorldLastEvent event) { + Adapter.renderWorld(); + } +} diff --git a/adapters/legacy/liteloader/java/marumasa/marumasa_sign/adapter/LiteModMarumaSign.java b/adapters/legacy/liteloader/java/marumasa/marumasa_sign/adapter/LiteModMarumaSign.java new file mode 100644 index 00000000..2d4045af --- /dev/null +++ b/adapters/legacy/liteloader/java/marumasa/marumasa_sign/adapter/LiteModMarumaSign.java @@ -0,0 +1,46 @@ +package marumasa.marumasa_sign.adapter; + +import com.mumfrey.liteloader.PostRenderListener; +import com.mumfrey.liteloader.Tickable; +import net.minecraft.client.Minecraft; + +import java.io.File; + +/** + * LiteLoader から起動されたときの入口。 + */ +public class LiteModMarumaSign implements Tickable, PostRenderListener { + + @Override + public String getName() { + return "MarumaSign"; + } + + @Override + public String getVersion() { + return BuildInfo.VERSION; + } + + @Override + public void init(File configPath) { + Adapter.init("liteloader"); + } + + @Override + public void upgradeSettings(String version, File configPath, File oldConfigPath) { + } + + @Override + public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock) { + if (clock) Adapter.tick(); + } + + @Override + public void onPostRenderEntities(float partialTicks) { + Adapter.renderWorld(); + } + + @Override + public void onPostRender(float partialTicks) { + } +} diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/Adapter.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/Adapter.java new file mode 100644 index 00000000..f98b1173 --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/Adapter.java @@ -0,0 +1,99 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.util.OptionsFile; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiEditSign; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.tileentity.TileEntitySign; +import org.apache.commons.lang3.ArrayUtils; + +import java.lang.reflect.Field; +import java.util.Map; + +/** + * Minecraft 1.7.10 - 1.12.2 向けの実装の入口。ローダーごとの処理から init と tick が呼ばれる。 + * バージョンによって違う部分は Mc クラスにまとめてある。 + */ +public final class Adapter { + + private static final Minecraft mc = Minecraft.getMinecraft(); + + // この実装が core を初期化したかどうか (他の経路で既に起動していれば false のまま) + private static boolean active; + private static KeyBinding openMenu; + private static boolean rendererInstalled; + private static Field editSignTile; + + private Adapter() { + } + + // loaderName: 起動したローダーの名前。初期化した場合は true を返す + public static synchronized boolean init(String loaderName) { + if (MarumaSign.isInitialized()) return false; + MarumaSign.init(new PlatformImpl(loaderName)); + active = true; + + // キーバインド登録 (48 は B キー) + openMenu = new KeyBinding("MarumaSign", 48, "key.categories.misc"); + mc.gameSettings.keyBindings = ArrayUtils.add(mc.gameSettings.keyBindings, openMenu); + // 保存されているキーの割り当てを反映する + final String saved = OptionsFile.read(Mc.gameDirectory(), "key_MarumaSign"); + if (saved != null) { + try { + openMenu.setKeyCode(Integer.parseInt(saved)); + } catch (NumberFormatException e) { + // 読めない値なら既定のキーのままにする + } + } + KeyBinding.resetKeyBindingArrayAndHash(); + return true; + } + + // クライアントの tick の最後に呼ばれる + public static void tick() { + if (!active) return; + if (!rendererInstalled) installRenderer(); + SignItems.install(mc); + + MarumaSign.tick(); + + while (openMenu.isPressed()) { + if (Mc.inWorld() && mc.currentScreen == null) MarumaSign.openMenu(); + } + + // 看板の編集画面が開かれたら、予約されている文字列を書き込んで閉じる + if (MarumaSign.hasPendingWrite() && mc.currentScreen instanceof GuiEditSign) { + writeSign((GuiEditSign) mc.currentScreen); + } + } + + // ワールドの描画の最後に呼ばれる + public static void renderWorld() { + if (active) WorldPass.render(); + } + + // 看板のレンダラーを置き換える + private static void installRenderer() { + final TileEntityRendererDispatcher dispatcher = TileEntityRendererDispatcher.instance; + final Map, Object> renderers = Reflect.get(Reflect.fieldOfType(TileEntityRendererDispatcher.class, Map.class), dispatcher); + final SignRenderer renderer = new SignRenderer(); + Mc.attach(renderer, dispatcher); + renderers.put(TileEntitySign.class, renderer); + rendererInstalled = true; + } + + private static void writeSign(GuiEditSign screen) { + if (editSignTile == null) editSignTile = Reflect.fieldOfType(GuiEditSign.class, TileEntitySign.class); + final TileEntitySign sign = Reflect.get(editSignTile, screen); + final String[] lines = MarumaSign.takePendingWrite(); + if (sign != null && lines != null) { + Mc.setSignText(sign, lines); + sign.markDirty(); + } + // 画面を閉じると、看板の内容がサーバーへ送信される + mc.displayGuiScreen(null); + } +} diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/ModelArrays.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/ModelArrays.java new file mode 100644 index 00000000..baa32222 --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/ModelArrays.java @@ -0,0 +1,108 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL13; +import org.lwjgl.opengl.GL15; +import org.lwjgl.opengl.GLContext; + +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.FloatBuffer; +import java.util.Map; +import java.util.WeakHashMap; + +/** + * 3D モデルの頂点を、配列にまとめて OpenGL に渡す。 + * 頂点が多いので、1 つずつ渡すと時間がかかる。 + */ +final class ModelArrays { + + private static final int BYTES_PER_VERTEX = SignImage.Batch.STRIDE * 4; + + private static final class Buffers { + final FloatBuffer vertices; + // 面の向き。影 Mod が光の当たり方を計算するのに使う + final FloatBuffer normals; + final ByteBuffer colors; + int revision = -1; + + Buffers(int vertexCount) { + vertices = BufferUtils.createFloatBuffer(vertexCount * SignImage.Batch.STRIDE); + normals = BufferUtils.createFloatBuffer(vertexCount * 3); + colors = BufferUtils.createByteBuffer(vertexCount * 4); + } + } + + // まとまりごとのバッファ。まとまりが使われなくなれば、一緒に破棄される + private static final Map BUFFERS = new WeakHashMap(); + + private ModelArrays() { + } + + static void draw(SignImage.Batch batch) { + Buffers buffers = BUFFERS.get(batch); + if (buffers == null) { + buffers = new Buffers(batch.vertexCount); + BUFFERS.put(batch, buffers); + } + if (buffers.revision != batch.revision) { + // 内容が変わったときだけ詰め直す。 + // clear などは、新しい Java とは戻り値の型が違うので、どの Java でも同じ呼び出しになるよう Buffer として呼ぶ + ((Buffer) buffers.vertices).clear(); + buffers.vertices.put(batch.vertices, 0, batch.vertexCount * SignImage.Batch.STRIDE); + ((Buffer) buffers.colors).clear(); + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int color = colors[i]; + buffers.colors.put((byte) (color >> 16)).put((byte) (color >> 8)).put((byte) color).put((byte) (color >>> 24)); + } + ((Buffer) buffers.colors).flip(); + fillNormals(batch, buffers.normals); + buffers.revision = batch.revision; + } + + // 変更した状態は glPopClientAttrib で元に戻す + GL11.glPushClientAttrib(GL11.GL_CLIENT_VERTEX_ARRAY_BIT); + if (GLContext.getCapabilities().OpenGL15) GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); + if (GLContext.getCapabilities().OpenGL13) GL13.glClientActiveTexture(GL13.GL_TEXTURE0); + GL11.glEnableClientState(GL11.GL_NORMAL_ARRAY); + GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); + GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY); + GL11.glEnableClientState(GL11.GL_COLOR_ARRAY); + // 位置とテクスチャ座標は、同じバッファに交互に入っている + ((Buffer) buffers.vertices).position(0); + GL11.glVertexPointer(3, BYTES_PER_VERTEX, buffers.vertices); + ((Buffer) buffers.vertices).position(3); + GL11.glTexCoordPointer(2, BYTES_PER_VERTEX, buffers.vertices); + ((Buffer) buffers.colors).position(0); + GL11.glColorPointer(4, true, 0, buffers.colors); + GL11.glNormalPointer(0, buffers.normals); + GL11.glDrawArrays(GL11.GL_QUADS, 0, batch.vertexCount); + GL11.glPopClientAttrib(); + } + + // 四角形ごとに、面の向きを求めて入れる。三角形は 3 つ目の頂点を重ねた四角形なので、最初の 3 頂点から求める + private static void fillNormals(SignImage.Batch batch, FloatBuffer normals) { + final float[] mesh = batch.vertices; + ((Buffer) normals).clear(); + for (int i = 0; i + 3 < batch.vertexCount; i += 4) { + final int a = i * SignImage.Batch.STRIDE, b = a + SignImage.Batch.STRIDE, c = b + SignImage.Batch.STRIDE; + final float ux = mesh[b] - mesh[a], uy = mesh[b + 1] - mesh[a + 1], uz = mesh[b + 2] - mesh[a + 2]; + final float vx = mesh[c] - mesh[a], vy = mesh[c + 1] - mesh[a + 1], vz = mesh[c + 2] - mesh[a + 2]; + float nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) { + nx /= length; + ny /= length; + nz /= length; + } else { + // 面積のない面は、上向きとして扱う + ny = 1; + } + for (int k = 0; k < 4; k++) normals.put(nx).put(ny).put(nz); + } + ((Buffer) normals).flip(); + } +} diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/PlatformImpl.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/PlatformImpl.java new file mode 100644 index 00000000..5dc6eb6a --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/PlatformImpl.java @@ -0,0 +1,134 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.Platform; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.realms.RealmsSharedConstants; +import net.minecraft.util.ResourceLocation; + +import java.io.File; + +final class PlatformImpl implements Platform { + + private final Minecraft mc = Minecraft.getMinecraft(); + private final String loaderName; + + PlatformImpl(String loaderName) { + this.loaderName = loaderName; + } + + // テクスチャのハンドル + static final class Texture { + final ResourceLocation location; + final DynamicTexture texture; + + Texture(ResourceLocation location, DynamicTexture texture) { + this.location = location; + this.texture = texture; + } + } + + @Override + public String minecraftVersion() { + return RealmsSharedConstants.VERSION_STRING; + } + + @Override + public String loaderName() { + return loaderName; + } + + @Override + public File gameDirectory() { + return Mc.gameDirectory(); + } + + @Override + public String languageCode() { + return mc.gameSettings.language; + } + + @Override + public void execute(Runnable task) { + Mc.execute(task); + } + + @Override + public void showMessage(String message) { + if (mc.ingameGUI != null) Mc.chat(message); + } + + @Override + public boolean isInWorld() { + return Mc.inWorld(); + } + + @Override + public int maxSignLineLength() { + return Mc.MAX_SIGN_LINE_LENGTH; + } + + @Override + public Object createTexture(int width, int height, int[] argb) { + final DynamicTexture texture = new DynamicTexture(width, height); + System.arraycopy(argb, 0, texture.getTextureData(), 0, width * height); + texture.updateDynamicTexture(); + return new Texture(mc.getTextureManager().getDynamicTextureLocation("marumasa_sign", texture), texture); + } + + @Override + public void updateTexture(Object handle, int width, int height, int[] argb) { + final DynamicTexture texture = ((Texture) handle).texture; + System.arraycopy(argb, 0, texture.getTextureData(), 0, width * height); + texture.updateDynamicTexture(); + } + + @Override + public void releaseTexture(Object handle) { + mc.getTextureManager().deleteTexture(((Texture) handle).location); + } + + @Override + public void openUi() { + mc.displayGuiScreen(new UiScreen()); + } + + @Override + public void closeUi() { + if (mc.currentScreen instanceof UiScreen) mc.displayGuiScreen(null); + } + + @Override + public boolean supportsFileDrop() { + return false; + } + + @Override + public String getClipboard() { + return GuiScreen.getClipboardString(); + } + + @Override + public void setClipboard(String text) { + GuiScreen.setClipboardString(text); + } + + @Override + public void selfTestLook(float pitch) { + Mc.look(pitch); + } + + @Override + public void selfTestUseItem() { + if (!Mc.inWorld()) return; + Mc.selectSign(); + KeyBinding.onTick(mc.gameSettings.keyBindUseItem.getKeyCode()); + } + + @Override + public void quit() { + mc.shutdown(); + } +} diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/ShaderHooks.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/ShaderHooks.java new file mode 100644 index 00000000..4692c2b6 --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/ShaderHooks.java @@ -0,0 +1,76 @@ +package marumasa.marumasa_sign.adapter; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +/** + * 影 Mod (OptiFine のシェーダー) への対応。 + * シェーダーが有効なとき、ワールドの中のものは、種類ごとに決まったシェーダーのプログラムで描く必要がある。 + * プログラムを切り替えずに描くと、明るさや法線などの情報が書き込まれず、 + * 背景 (空など) の情報のまま合成されて、白っぽくにじんだ絵になってしまう。 + * そこで、看板の絵を描く前後に、ブロックエンティティを描くときと同じ切り替えを OptiFine に頼む。 + * + * OptiFine のクラスは Minecraft 本体と違って名前が変わらないので、名前で呼び出す。 + * OptiFine が入っていなければ、何もしない。 + */ +final class ShaderHooks { + + // OptiFine のシェーダーのクラス。バージョンによってパッケージが違う + private static final String[] CLASS_NAMES = {"net.optifine.shaders.Shaders", "shadersmod.client.Shaders"}; + + private static boolean searched; + private static Method begin; + private static Method end; + private static Field packLoaded; + private static Field renderingWorld; + + private ShaderHooks() { + } + + private static void search() { + searched = true; + for (String name : CLASS_NAMES) { + try { + final Class shaders = Class.forName(name); + final Method beginMethod = shaders.getMethod("beginBlockEntities"); + final Method endMethod = shaders.getMethod("endBlockEntities"); + packLoaded = shaders.getField("shaderPackLoaded"); + renderingWorld = shaders.getField("isRenderingWorld"); + begin = beginMethod; + end = endMethod; + return; + } catch (ReflectiveOperationException e) { + // このクラスはない。次の候補を試す + } catch (LinkageError e) { + // 読み込めない形で入っている場合も、ないものとして扱う + } + } + } + + /** + * ブロックエンティティ用のプログラムに切り替える。切り替えた場合は true を返すので、描き終わったら end を呼ぶこと。 + */ + static boolean begin() { + if (!searched) search(); + if (begin == null) return false; + try { + // シェーダーパックを使っていて、ワールドを描いている最中のときだけ切り替える + if (!packLoaded.getBoolean(null) || !renderingWorld.getBoolean(null)) return false; + begin.invoke(null); + return true; + } catch (ReflectiveOperationException e) { + // 呼び出せないバージョンでは、以後は何もしない + begin = null; + return false; + } + } + + static void end() { + if (end == null) return; + try { + end.invoke(null); + } catch (ReflectiveOperationException e) { + end = null; + } + } +} \ No newline at end of file diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/SignDraw.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/SignDraw.java new file mode 100644 index 00000000..10052564 --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/SignDraw.java @@ -0,0 +1,95 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.client.Minecraft; +import net.minecraft.tileentity.TileEntitySign; +import org.lwjgl.opengl.GL11; + +/** + * 看板の位置に画像を描く。 + * 頂点の送り方はバージョンごとに API が違うため、OpenGL を直接使って共通にしている。 + */ +final class SignDraw { + + private SignDraw() { + } + + // 看板に対応する画像を返す。MarumaSign の看板でなければ null + static SignImage find(TileEntitySign sign) { + return MarumaSign.sign(Mc.signText(sign)); + } + + // 壁掛け看板の向き (メタデータ) を角度にする + private static float wallYaw(int metadata) { + switch (metadata) { + case 2: return 180f; + case 4: return 90f; + case 5: return 270f; + default: return 0f; + } + } + + static void draw(SignImage image, TileEntitySign sign, double x, double y, double z) { + final boolean wall = Mc.isWallSign(sign); + final int metadata = sign.getBlockMetadata(); + final float yaw = wall ? wallYaw(metadata) : metadata * 22.5f; + // x, y, z はカメラから見た位置なので、そのまま看板までの距離になる + final SignImage.Batch[] batches = image.batches(yaw, wall, Math.sqrt(x * x + y * y + z * z)); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + drawBatches(batches); + GL11.glPopMatrix(); + MarumaSign.drawn(image); + } + + /** + * 四角形のまとまりを、現在の座標系に描く。看板のアイテムを描くときにも使う。 + */ + static void drawBatches(SignImage.Batch[] batches) { + // 変更した状態は glPopAttrib で元に戻す + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_CURRENT_BIT | GL11.GL_LIGHTING_BIT + | GL11.GL_DEPTH_BUFFER_BIT); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1f, 1f, 1f, 1f); + // 3D モデルは陰影を計算済みなので、影 Mod には上を向いた面として扱ってもらう (絵は面ごとに向きを指定する) + GL11.glNormal3f(0f, 1f, 0f); + + for (SignImage.Batch batch : batches) { + Minecraft.getMinecraft().getTextureManager().bindTexture(((PlatformImpl.Texture) batch.texture).location); + if (batch.colors != null) { + // 3D モデルは裏を向いた面と、透明な部分を描かない + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1f); + GL11.glDepthMask(!batch.blend); + ModelArrays.draw(batch); + continue; + } + final float[] mesh = batch.vertices; + GL11.glBegin(GL11.GL_QUADS); + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + if ((i & 3) == 0 && i + 2 < batch.vertexCount) { + // 面の向き。影 Mod が光の当たり方を計算するのに使う (通常の描画では使われない) + final int b = o + SignImage.Batch.STRIDE, c = b + SignImage.Batch.STRIDE; + final float ux = mesh[b] - mesh[o], uy = mesh[b + 1] - mesh[o + 1], uz = mesh[b + 2] - mesh[o + 2]; + final float vx = mesh[c] - mesh[o], vy = mesh[c + 1] - mesh[o + 1], vz = mesh[c + 2] - mesh[o + 2]; + final float nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) GL11.glNormal3f(nx / length, ny / length, nz / length); + } + GL11.glTexCoord2f(mesh[o + 3], mesh[o + 4]); + GL11.glVertex3f(mesh[o], mesh[o + 1], mesh[o + 2]); + } + GL11.glEnd(); + } + GL11.glPopAttrib(); + } +} diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..bb8164fa --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,104 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.ui.Key; +import marumasa.marumasa_sign.core.ui.UiRoot; +import net.minecraft.client.gui.GuiScreen; +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; + +/** + * MarumaSign の画面。描画と入力を core の UiRoot に橋渡しするだけ。 + */ +final class UiScreen extends GuiScreen { + + private final UiRoot ui = MarumaSign.ui(); + + UiScreen() { + ui.opened(); + } + + @Override + public void initGui() { + Keyboard.enableRepeatEvents(true); + ui.layout(mc.displayWidth, mc.displayHeight); + } + + @Override + public void onGuiClosed() { + Keyboard.enableRepeatEvents(false); + ui.closed(); + } + + @Override + public boolean doesGuiPauseGame() { + return false; + } + + // マウスの座標をフレームバッファのピクセル単位にする (上が 0) + private int pixelY(int y) { + return mc.displayHeight - y - 1; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + ui.layout(mc.displayWidth, mc.displayHeight); + ui.mouseMoved(Mouse.getX(), pixelY(Mouse.getY())); + + final Object texture = ui.texture(); + if (texture == null) return; + mc.getTextureManager().bindTexture(((PlatformImpl.Texture) texture).location); + + final float x0 = ui.originX(); + final float y0 = ui.originY(); + final float x1 = x0 + ui.pixelWidth(); + final float y1 = y0 + ui.pixelHeight(); + + // 変更した状態は glPopAttrib で元に戻す + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_CURRENT_BIT | GL11.GL_LIGHTING_BIT); + GL11.glPushMatrix(); + // GUI の拡大率を打ち消して、ピクセル単位で描く + final float unscale = (float) width / mc.displayWidth; + GL11.glScalef(unscale, unscale, 1f); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1f, 1f, 1f, 1f); + + GL11.glBegin(GL11.GL_QUADS); + GL11.glTexCoord2f(0f, 1f); + GL11.glVertex3f(x0, y1, 0f); + GL11.glTexCoord2f(1f, 1f); + GL11.glVertex3f(x1, y1, 0f); + GL11.glTexCoord2f(1f, 0f); + GL11.glVertex3f(x1, y0, 0f); + GL11.glTexCoord2f(0f, 0f); + GL11.glVertex3f(x0, y0, 0f); + GL11.glEnd(); + + GL11.glPopMatrix(); + GL11.glPopAttrib(); + } + + @Override + public void handleMouseInput() { + final int x = Mouse.getEventX(); + final int y = pixelY(Mouse.getEventY()); + if (Mouse.getEventButton() == 0) { + if (Mouse.getEventButtonState()) ui.mousePressed(x, y); + else ui.mouseReleased(x, y); + } + final int wheel = Mouse.getEventDWheel(); + if (wheel != 0) ui.mouseScrolled(x, y, wheel); + } + + @Override + protected void keyTyped(char typedChar, int keyCode) { + final boolean ctrl = isCtrlKeyDown(); + final int key = Key.fromLwjgl2(keyCode); + if (key != Key.UNKNOWN) ui.keyPressed(key, Key.modifiers(isShiftKeyDown(), ctrl)); + if (!ctrl && typedChar >= 0x20 && typedChar != 0x7F) ui.charTyped(typedChar); + } +} diff --git a/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/WorldPass.java b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/WorldPass.java new file mode 100644 index 00000000..890da899 --- /dev/null +++ b/adapters/legacy/main/java/marumasa/marumasa_sign/adapter/WorldPass.java @@ -0,0 +1,52 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.tileentity.TileEntitySign; + +import java.util.List; + +/** + * ワールドの描画の最後に、すべての MarumaSign の画像を描く。 + * 看板のレンダラーから描くと、看板のブロックが視界の外にあるときや遠いときに + * 画像ごと省かれてしまうため、看板とは別に自前で描いている。 + */ +public final class WorldPass { + + private WorldPass() { + } + + public static void render() { + if (!Mc.inWorld()) return; + + final List tileEntities = Mc.tileEntities(); + boolean lightmap = false; + boolean shaders = false; + for (int i = 0; i < tileEntities.size(); i++) { + final Object tileEntity = tileEntities.get(i); + if (!(tileEntity instanceof TileEntitySign)) continue; + final TileEntitySign sign = (TileEntitySign) tileEntity; + final SignImage image = SignDraw.find(sign); + if (image == null) continue; + + // カメラから見た位置 + final double x = Mc.x(sign) - TileEntityRendererDispatcher.staticPlayerX; + final double y = Mc.y(sign) - TileEntityRendererDispatcher.staticPlayerY; + final double z = Mc.z(sign) - TileEntityRendererDispatcher.staticPlayerZ; + final double distance = image.viewDistance(); + if (x * x + y * y + z * z > distance * distance) continue; + + if (!lightmap) { + Mc.enableLightmap(); + lightmap = true; + // 影 Mod が有効なら、ブロックエンティティ用のシェーダーで描く + shaders = ShaderHooks.begin(); + } + // 看板の位置の明るさで描く + Mc.applyLight(sign); + SignDraw.draw(image, sign, x, y, z); + } + if (shaders) ShaderHooks.end(); + if (lightmap) Mc.disableLightmap(); + } +} diff --git a/adapters/modern/main/java/marumasa/marumasa_sign/adapter/Adapter.java b/adapters/modern/main/java/marumasa/marumasa_sign/adapter/Adapter.java new file mode 100644 index 00000000..6cd9d02b --- /dev/null +++ b/adapters/modern/main/java/marumasa/marumasa_sign/adapter/Adapter.java @@ -0,0 +1,103 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.util.OptionsFile; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; + +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * Minecraft 1.14 以降向けの実装の入口。バージョンによって違う部分は Mc クラスなどにまとめてある。 + * ローダーの API を使わずに済むよう、タイマーから定期的にメインスレッドへ処理を渡している。 + */ +public final class Adapter { + + // 処理を呼ぶ間隔 (ミリ秒)。ゲームの 1 tick と同じ + private static final long INTERVAL = 50; + // GLFW の B キー + private static final int KEY_B = 66; + + private static final AtomicBoolean started = new AtomicBoolean(); + // メインスレッドに渡した処理がまだ実行されていないかどうか + private static final AtomicBoolean pending = new AtomicBoolean(); + + private static String loaderName; + // この実装が core を初期化したかどうか (他の経路で既に起動していれば false のまま) + private static boolean active; + private static boolean initialized; + private static KeyMapping openMenu; + + private Adapter() { + } + + // loader: 起動したローダーの名前 + public static void start(String loader) { + if (!started.compareAndSet(false, true)) return; + loaderName = loader; + new Timer("MarumaSign-Tick", true).schedule(new TimerTask() { + @Override + public void run() { + final Minecraft mc = Minecraft.getInstance(); + if (mc == null || !pending.compareAndSet(false, true)) return; + mc.execute(Adapter::tick); + } + }, INTERVAL, INTERVAL); + } + + private static void tick() { + pending.set(false); + final Minecraft mc = Minecraft.getInstance(); + if (!initialized) { + // 設定の読み込みが終わるまで待つ + if (mc.options == null) return; + initialized = true; + if (MarumaSign.isInitialized()) return; + MarumaSign.init(new PlatformImpl(loaderName)); + active = true; + registerKey(mc); + } + if (!active) return; + + SignRendererBase.install(mc); + SignItems.install(mc); + MarumaSign.tick(); + if (mc.player != null && "forge".equals(loaderName)) Mc.avoidExactAngles(mc); + + while (openMenu.consumeClick()) { + if (mc.player != null && Mc.screen(mc) == null) MarumaSign.openMenu(); + } + + // 看板の編集画面が開かれたら、予約されている文字列を書き込んで閉じる + if (MarumaSign.hasPendingWrite() && Mc.isSignEdit(Mc.screen(mc))) { + final String[] lines = MarumaSign.takePendingWrite(); + if (lines != null) Mc.fillSign(Mc.screen(mc), lines); + // 画面を閉じると、看板の内容がサーバーへ送信される + Mc.setScreen(mc, null); + } + } + + // キーバインド登録 + private static void registerKey(Minecraft mc) { + openMenu = Mc.newKey("MarumaSign", KEY_B); + final KeyMapping[] current = mc.options.keyMappings; + final KeyMapping[] extended = new KeyMapping[current.length + 1]; + System.arraycopy(current, 0, extended, 0, current.length); + extended[current.length] = openMenu; + Reflect.set(Reflect.fieldHolding(mc.options, current), mc.options, extended); + // 保存されているキーの割り当てを反映する + final String saved = OptionsFile.read(mc.gameDirectory, "key_MarumaSign"); + if (saved != null && !saved.isEmpty()) { + try { + openMenu.setKey(InputConstants.getKey(saved)); + } catch (RuntimeException e) { + // 読めない値なら既定のキーのままにする + } + } + KeyMapping.resetMapping(); + } +} diff --git a/adapters/modern/main/java/marumasa/marumasa_sign/adapter/PlatformImpl.java b/adapters/modern/main/java/marumasa/marumasa_sign/adapter/PlatformImpl.java new file mode 100644 index 00000000..68f1fb00 --- /dev/null +++ b/adapters/modern/main/java/marumasa/marumasa_sign/adapter/PlatformImpl.java @@ -0,0 +1,119 @@ +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.Platform; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; + +import java.io.File; + +final class PlatformImpl implements Platform { + + private final Minecraft mc = Minecraft.getInstance(); + private final String loaderName; + + PlatformImpl(String loaderName) { + this.loaderName = loaderName; + } + + @Override + public String minecraftVersion() { + return Mc.version(); + } + + @Override + public String loaderName() { + return loaderName; + } + + @Override + public File gameDirectory() { + return mc.gameDirectory; + } + + @Override + public String languageCode() { + return mc.options.languageCode; + } + + @Override + public void execute(Runnable task) { + mc.execute(task); + } + + @Override + public void showMessage(String message) { + Mc.chat(mc, message); + } + + @Override + public boolean isInWorld() { + return mc.level != null && mc.player != null; + } + + @Override + public int maxSignLineLength() { + return 80; + } + + @Override + public Object createTexture(int width, int height, int[] argb) { + return Tex.create(mc, width, height, argb); + } + + @Override + public void updateTexture(Object handle, int width, int height, int[] argb) { + ((Tex) handle).update(width, height, argb); + } + + @Override + public void releaseTexture(Object handle) { + ((Tex) handle).release(mc); + } + + @Override + public void openUi() { + Mc.setScreen(mc, new UiScreen()); + } + + @Override + public void closeUi() { + if (Mc.screen(mc) instanceof UiScreen) Mc.setScreen(mc, null); + } + + @Override + public boolean supportsFileDrop() { + return true; + } + + @Override + public String getClipboard() { + return mc.keyboardHandler.getClipboard(); + } + + @Override + public void setClipboard(String text) { + mc.keyboardHandler.setClipboard(text); + } + + @Override + public void selfTestLook(float pitch) { + if (mc.player != null) Mc.look(mc, pitch); + } + + @Override + public void selfTestUseItem() { + if (mc.player == null) return; + Mc.selectSign(mc); + KeyMapping.click(mc.options.keyUse.getDefaultKey()); + } + + @Override + public boolean selfTestJoin(String host, int port) { + return Join.start(mc, host, port); + } + + @Override + public void quit() { + mc.stop(); + } +} diff --git a/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/Join.java b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/Join.java new file mode 100644 index 00000000..1b3ea036 --- /dev/null +++ b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/Join.java @@ -0,0 +1,16 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; + +/** + * 動作確認のときの、サーバーへの接続。このバージョンでは起動時の指定で接続できるので、何もしない。 + */ +final class Join { + + private Join() { + } + + static boolean start(Minecraft mc, String host, int port) { + return false; + } +} diff --git a/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/SignItems.java b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/SignItems.java new file mode 100644 index 00000000..bb10a865 --- /dev/null +++ b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/SignItems.java @@ -0,0 +1,203 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.client.renderer.special.SpecialModelRenderer; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.nbt.Tag; +import net.minecraft.world.entity.ItemOwner; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.TypedEntityData; +import net.minecraft.world.level.block.StandingSignBlock; +import org.joml.Vector3f; +import org.joml.Vector3fc; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。 + * アイテムのモデルの表にある看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ描き方を差し替える。 + */ +final class SignItems { + + private static Field modelsField; + private static Field layersField; + private static Field layerCountField; + + private SignItems() { + } + + // 看板アイテムのモデルがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + // アイテムの情報は、ワールドに入るまで読めないバージョンがある + if (mc.level == null) return; + final ModelManager manager = mc.getModelManager(); + if (manager == null) return; + + // 看板アイテムと、そのモデルの名前 + final List ids = new ArrayList(); + for (Item item : BuiltInRegistries.ITEM) { + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) continue; + final Object id = new ItemStack(item).get(DataComponents.ITEM_MODEL); + if (id != null) ids.add(id); + } + if (ids.isEmpty()) return; + + if (modelsField == null) { + // アイテムのモデルの表は、同じ型のフィールドがほかにもあるので、中身で見分ける + for (Field field : ModelManager.class.getDeclaredFields()) { + if (!Map.class.isAssignableFrom(field.getType())) continue; + field.setAccessible(true); + final Map map = Reflect.get(field, manager); + if (map != null && map.get(ids.get(0)) instanceof ItemModel) { + modelsField = field; + break; + } + } + // まだモデルが読み込まれていない + if (modelsField == null) return; + } + + final Map models = Reflect.get(modelsField, manager); + if (models == null) return; + boolean wrapped = true; + for (Object id : ids) { + final ItemModel model = models.get(id); + if (model != null && !(model instanceof Model)) wrapped = false; + } + if (wrapped) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map replaced = new HashMap(models); + for (Object id : ids) { + final ItemModel model = replaced.get(id); + if (model != null && !(model instanceof Model)) replaced.put(id, new Model(model)); + } + Reflect.set(modelsField, manager, replaced); + } + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) { + final TypedEntityData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (data == null) return null; + final CompoundTag tag = data.getUnsafe(); + final String[] lines = new String[8]; + readLines(tag.getCompoundOrEmpty("front_text"), lines, 0); + readLines(tag.getCompoundOrEmpty("back_text"), lines, 4); + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + final ListTag messages = text.getListOrEmpty("messages"); + for (int i = 0; i < 4 && i < messages.size(); i++) { + final Tag message = messages.get(i); + // 文字だけの行は文字列で、装飾のある行は複合タグで保存されている + lines[offset + i] = message instanceof StringTag ? ((StringTag) message).value() : String.valueOf(message); + } + } + + /** + * 看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ、中身を画像に差し替える。 + */ + private static final class Model implements ItemModel { + + private final ItemModel delegate; + + Model(ItemModel delegate) { + this.delegate = delegate; + } + + @Override + public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, + ClientLevel level, ItemOwner owner, int seed) { + final SignImage image = find(stack); + if (image == null) { + delegate.update(state, stack, resolver, context, level, owner, seed); + return; + } + + // 元のモデルに層を作らせて、手に持ったときや枠の中での位置と向きをそのまま使う + if (layersField == null) { + layersField = Reflect.fieldOfType(ItemStackRenderState.class, ItemStackRenderState.LayerRenderState[].class); + layerCountField = Reflect.fieldOfType(ItemStackRenderState.class, int.class); + } + final int before = Reflect.get(layerCountField, state); + delegate.update(state, stack, resolver, context, level, owner, seed); + final int after = Reflect.get(layerCountField, state); + final ItemStackRenderState.LayerRenderState[] layers = Reflect.get(layersField, state); + + if (after > before) { + // 元の絵 (板の形) は描かず、最初の層で画像を描く。残りの層には何も描かせない + layers[before].setupSpecialModel(Renderer.INSTANCE, image); + for (int i = before + 1; i < after; i++) layers[i].setupSpecialModel(Renderer.INSTANCE, null); + } else { + state.newLayer().setupSpecialModel(Renderer.INSTANCE, image); + } + // 動画などで内容が変わるので、枠の中の絵を使い回さず毎回描き直してもらう + state.appendModelIdentityElement(image); + state.setAnimated(); + } + } + + /** + * 画像を描く部分。 + * 引数や戻り値の型はバージョンによって違うため、それぞれの形のメソッドを用意しておき、 + * そのバージョンにあるほうが使われる (そのため @Override は付けない)。 + */ + private static final class Renderer implements SpecialModelRenderer { + + static final Renderer INSTANCE = new Renderer(); + + public void submit(SignImage image, PoseStack poseStack, SubmitNodeCollector collector, int light, int overlay, + boolean foil, int outlineColor) { + if (image == null) return; + // 距離は分からないので、手元にあるものとして扱う + SignRendererBase.submitBatches(image.itemBatches(1.0), poseStack, collector, light); + MarumaSign.drawn(image); + } + + public void submit(SignImage image, ItemDisplayContext context, PoseStack poseStack, SubmitNodeCollector collector, + int light, int overlay, boolean foil, int outlineColor) { + submit(image, poseStack, collector, light, overlay, foil, outlineColor); + } + + // アイテムが占める範囲。一辺 1 の立方体の中に収まる + public void getExtents(Consumer output) { + output.accept(new Vector3f(0f, 0f, 0f)); + output.accept(new Vector3f(1f, 1f, 1f)); + } + + public void getExtents(Set output) { + output.add(new Vector3f(0f, 0f, 0f)); + output.add(new Vector3f(1f, 1f, 1f)); + } + + public SignImage extractArgument(ItemStack stack) { + return find(stack); + } + } +} diff --git a/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java new file mode 100644 index 00000000..6e825239 --- /dev/null +++ b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/SignRendererBase.java @@ -0,0 +1,163 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import net.minecraft.client.renderer.culling.Frustum; +import net.minecraft.client.renderer.feature.ModelFeatureRenderer; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + * submit の引数の型はバージョンによって違うため、SignRendererWrapper 側で実装する。 + */ +abstract class SignRendererBase implements BlockEntityRenderer { + + static final class State extends BlockEntityRenderState { + // 元のレンダラーの状態 + BlockEntityRenderState inner; + SignImage image; + float yaw; + boolean wall; + boolean spectator; + // カメラから看板までの距離 (ブロック) + double distance; + } + + private static Field renderersField; + + protected final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + protected SignRendererBase(BlockEntityRenderer delegate) { + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + SignBoards.install(mc); + final BlockEntityRenderDispatcher dispatcher = mc.getBlockEntityRenderDispatcher(); + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(Mc.SIGN); + if (current == null || current instanceof SignRendererBase) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map, BlockEntityRenderer> replaced = new HashMap, BlockEntityRenderer>(renderers); + replaced.put(Mc.SIGN, new SignRendererWrapper((BlockEntityRenderer) current)); + Reflect.set(renderersField, dispatcher, replaced); + } + + @Override + public State createRenderState() { + final State state = new State(); + state.inner = delegate.createRenderState(); + return state; + } + + @Override + public void extractRenderState(SignBlockEntity sign, State state, float partialTicks, Vec3 cameraPosition, + ModelFeatureRenderer.CrumblingOverlay breakProgress) { + delegate.extractRenderState(sign, state.inner, partialTicks, cameraPosition, breakProgress); + BlockEntityRenderState.extractBase(sign, state, breakProgress); + + state.image = MarumaSign.sign(Mc.signText(sign)); + state.spectator = mc.player != null && mc.player.isSpectator(); + // スペクテイターには看板そのものも見せる + SignBoards.track(sign, state.image != null && !state.spectator); + if (state.image == null) return; + state.distance = Math.sqrt(sign.getBlockPos().distToCenterSqr(cameraPosition)); + + final BlockState blockState = sign.getBlockState(); + if (blockState.getBlock() instanceof WallSignBlock) { + state.wall = true; + state.yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + state.wall = false; + state.yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + state.image = null; + } + } + + // 画像を描く。MarumaSign の看板でなければ何もしない + protected final void submitImage(State state, PoseStack poseStack, SubmitNodeCollector collector, Frustum frustum) { + final SignImage image = state.image; + if (image == null) return; + + // 視錐台カリング + final float[] bounds = image.bounds(state.yaw, state.wall); + final BlockPos pos = state.blockPos; + if (frustum != null && !frustum.isVisible(new AABB( + pos.getX() + bounds[0], pos.getY() + bounds[1], pos.getZ() + bounds[2], + pos.getX() + bounds[3], pos.getY() + bounds[4], pos.getZ() + bounds[5]))) { + return; + } + + submitBatches(image.batches(state.yaw, state.wall, state.distance), poseStack, collector, state.lightCoords); + MarumaSign.drawn(image); + } + + /** + * 四角形のまとまりを、現在の座標系に描く。看板のアイテムを描くときにも使う。 + */ + static void submitBatches(SignImage.Batch[] batches, PoseStack poseStack, SubmitNodeCollector collector, final int light) { + for (final SignImage.Batch batch : batches) { + collector.submitCustomGeometry(poseStack, ((Tex) batch.texture).renderType, (pose, vertices) -> { + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.addVertex(pose, mesh[o], mesh[o + 1], mesh[o + 2]) + .setColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .setUv(mesh[o + 3], mesh[o + 4]) + .setLight(light); + } + }); + } + } + + // 看板そのものを描くかどうか。スペクテイターには看板も見せる + protected static boolean drawsVanilla(State state) { + return state.image == null || state.spectator; + } + + @Override + public boolean shouldRenderOffScreen() { + return true; + } + + @Override + public int getViewDistance() { + return 512; + } + + @Override + public boolean shouldRender(SignBlockEntity sign, Vec3 cameraPosition) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + if (image == null) return delegate.shouldRender(sign, cameraPosition); + return Vec3.atCenterOf(sign.getBlockPos()).closerThan(cameraPosition, image.viewDistance()); + } +} diff --git a/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/UiScreenBase.java b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/UiScreenBase.java new file mode 100644 index 00000000..5f605b8b --- /dev/null +++ b/adapters/renderstate/main/java/marumasa/marumasa_sign/adapter/UiScreenBase.java @@ -0,0 +1,112 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.ui.Key; +import marumasa.marumasa_sign.core.ui.UiRoot; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.input.CharacterEvent; +import net.minecraft.client.input.KeyEvent; +import net.minecraft.client.input.MouseButtonEvent; + +import java.io.File; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +/** + * MarumaSign の画面。入力を core の UiRoot に橋渡しする。 + * 描画のメソッドはバージョンによって名前や引数が違うため、UiScreen 側で実装する。 + */ +abstract class UiScreenBase extends Screen { + + protected final UiRoot ui = MarumaSign.ui(); + + protected UiScreenBase() { + super(Mc.text("MarumaSign")); + ui.opened(); + } + + @Override + protected void init() { + final Window window = minecraft.getWindow(); + ui.layout(window.getWidth(), window.getHeight()); + } + + @Override + public void removed() { + ui.closed(); + } + + @Override + public boolean isPauseScreen() { + return false; + } + + // 描画の直前に呼ぶ。画面に貼るテクスチャを返す (なければ null) + protected final Tex prepare() { + final Window window = minecraft.getWindow(); + ui.layout(window.getWidth(), window.getHeight()); + ui.mouseMoved(mouseX(), mouseY()); + return (Tex) ui.texture(); + } + + // GUI の拡大率を打ち消して、ピクセル単位で描くための倍率 + protected final float unscale() { + return 1f / minecraft.getWindow().getGuiScale(); + } + + // マウスの座標 (ウィンドウ上の位置) をフレームバッファのピクセル単位にする + private double mouseX() { + final Window window = minecraft.getWindow(); + return minecraft.mouseHandler.xpos() * window.getWidth() / Math.max(1, window.getScreenWidth()); + } + + private double mouseY() { + final Window window = minecraft.getWindow(); + return minecraft.mouseHandler.ypos() * window.getHeight() / Math.max(1, window.getScreenHeight()); + } + + @Override + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { + if (event.button() == 0) ui.mousePressed(mouseX(), mouseY()); + return true; + } + + @Override + public boolean mouseReleased(MouseButtonEvent event) { + if (event.button() == 0) ui.mouseReleased(mouseX(), mouseY()); + return true; + } + + @Override + public boolean mouseScrolled(double x, double y, double scrollX, double scrollY) { + ui.mouseScrolled(mouseX(), mouseY(), scrollY); + return true; + } + + @Override + public boolean keyPressed(KeyEvent event) { + final int key = Key.fromGlfw(event.key()); + if (key != Key.UNKNOWN) ui.keyPressed(key, Key.modifiersFromGlfw(event.modifiers())); + return true; + } + + @Override + public boolean charTyped(CharacterEvent event) { + final String text = event.codepointAsString(); + for (int i = 0; i < text.length(); i++) { + ui.charTyped(text.charAt(i)); + } + return true; + } + + @Override + public void onFilesDrop(List paths) { + final List files = new ArrayList(); + for (Path path : paths) { + files.add(path.toFile()); + } + ui.filesDropped(files); + } +} diff --git a/adapters/tex_0/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_0/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..957c7158 --- /dev/null +++ b/adapters/tex_0/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,54 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.ResourceLocation; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.14 の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final ResourceLocation id; + private final DynamicTexture texture; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + // この API は ABGR の並びで受け取る + final int color = argb[row + x]; + image.setPixelRGBA(x, y, (color & 0xFF00FF00) | ((color & 0xFF) << 16) | ((color >> 16) & 0xFF)); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = new ResourceLocation(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/tex_1/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_1/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..00e78c99 --- /dev/null +++ b/adapters/tex_1/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,58 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.ResourceLocation; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.20.6 以前の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final ResourceLocation id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + this.renderType = RenderType.text(id); + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + final int color = argb[row + x]; + image.setPixelRGBA(x, y, (color & 0xFF00FF00) | ((color & 0xFF) << 16) | ((color >> 16) & 0xFF)); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = new ResourceLocation(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/tex_1r/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_1r/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..7dad4a11 --- /dev/null +++ b/adapters/tex_1r/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,67 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.AbstractTexture; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.resources.ResourceLocation; + +import java.lang.reflect.Method; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.15 - 1.15.2 の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + // テクスチャを登録するメソッド。1.15.2 で戻り値の型が変わったので、どのバージョンでも動くように引数の型で探す + private static Method register; + + final ResourceLocation id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + this.renderType = RenderType.text(id); + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + final int color = argb[row + x]; + image.setPixelRGBA(x, y, (color & 0xFF00FF00) | ((color & 0xFF) << 16) | ((color >> 16) & 0xFF)); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = new ResourceLocation(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(image); + if (register == null) { + register = Reflect.methodWithParameters(TextureManager.class, ResourceLocation.class, AbstractTexture.class); + } + Reflect.invoke(register, mc.getTextureManager(), id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/tex_2/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_2/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..963f1ec5 --- /dev/null +++ b/adapters/tex_2/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,58 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.ResourceLocation; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.21 - 1.21.1 の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final ResourceLocation id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + this.renderType = RenderType.text(id); + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + final int color = argb[row + x]; + image.setPixelRGBA(x, y, (color & 0xFF00FF00) | ((color & 0xFF) << 16) | ((color >> 16) & 0xFF)); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = ResourceLocation.fromNamespaceAndPath(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/tex_3/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_3/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..e0e5cb63 --- /dev/null +++ b/adapters/tex_3/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,57 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.ResourceLocation; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.21.2 - 1.21.4 の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final ResourceLocation id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + this.renderType = RenderType.text(id); + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + image.setPixel(x, y, argb[row + x]); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = ResourceLocation.fromNamespaceAndPath(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/tex_4/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_4/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..da564ecb --- /dev/null +++ b/adapters/tex_4/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,57 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.ResourceLocation; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.21.5 - 1.21.10 の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final ResourceLocation id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + this.renderType = RenderType.text(id); + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + image.setPixel(x, y, argb[row + x]); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = ResourceLocation.fromNamespaceAndPath(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(() -> "marumasa_sign", image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/tex_5/main/java/marumasa/marumasa_sign/adapter/Tex.java b/adapters/tex_5/main/java/marumasa/marumasa_sign/adapter/Tex.java new file mode 100644 index 00000000..b01989c8 --- /dev/null +++ b/adapters/tex_5/main/java/marumasa/marumasa_sign/adapter/Tex.java @@ -0,0 +1,58 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.rendertype.RenderType; +import net.minecraft.client.renderer.rendertype.RenderTypes; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.Identifier; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.21.11 以降の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final Identifier id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex(Identifier id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + this.renderType = RenderTypes.text(id); + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + image.setPixel(x, y, argb[row + x]); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final Identifier id = Identifier.fromNamespaceAndPath(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(() -> "marumasa_sign", image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} diff --git a/adapters/v1_10/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_10/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..5b09aece --- /dev/null +++ b/adapters/v1_10/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.block.BlockWallSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.text.TextComponentString; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.10 - 1.10.2 に固有の部分。 + */ +final class Mc { + + static final int MAX_SIGN_LINE_LENGTH = 80; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.world != null && mc.player != null; + } + + static boolean isSpectator() { + return mc.player != null && mc.player.isSpectator(); + } + + static File gameDirectory() { + return mc.mcDataDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.setRendererDispatcher(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i].getUnformattedText()); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + for (int i = 0; i < 4; i++) { + sign.signText[i] = new TextComponentString(lines[i]); + } + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() instanceof BlockWallSign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.world.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.getPos().getX(); + } + + static double y(TileEntitySign sign) { + return sign.getPos().getY(); + } + + static double z(TileEntitySign sign) { + return sign.getPos().getZ(); + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.world.getCombinedLight(sign.getPos(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.player != null) mc.player.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.player.inventory.mainInventory[slot]; + if (stack != null && stack.getItem() == Items.SIGN) { + mc.player.inventory.currentItem = slot; + } + } + } +} \ No newline at end of file diff --git a/adapters/v1_10/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_10/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..fbcdd682 --- /dev/null +++ b/adapters/v1_10/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,18 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + @Override + public void renderTileEntityAt(TileEntitySign sign, double x, double y, double z, float partialTicks, int destroyStage) { + // MarumaSign の看板は描かない (画像は WorldPass が描く)。スペクテイターには看板も見せる + if (SignDraw.find(sign) == null || Mc.isSpectator()) { + super.renderTileEntityAt(sign, x, y, z, partialTicks, destroyStage); + } + } +} \ No newline at end of file diff --git a/adapters/v1_11/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_11/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..8baea124 --- /dev/null +++ b/adapters/v1_11/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.block.BlockWallSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.text.TextComponentString; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.11 - 1.11.2 に固有の部分。 + */ +final class Mc { + + static final int MAX_SIGN_LINE_LENGTH = 80; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.world != null && mc.player != null; + } + + static boolean isSpectator() { + return mc.player != null && mc.player.isSpectator(); + } + + static File gameDirectory() { + return mc.mcDataDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.setRendererDispatcher(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i].getUnformattedText()); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + for (int i = 0; i < 4; i++) { + sign.signText[i] = new TextComponentString(lines[i]); + } + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() instanceof BlockWallSign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.world.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.getPos().getX(); + } + + static double y(TileEntitySign sign) { + return sign.getPos().getY(); + } + + static double z(TileEntitySign sign) { + return sign.getPos().getZ(); + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.world.getCombinedLight(sign.getPos(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.player != null) mc.player.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.player.inventory.mainInventory.get(slot); + if (stack != null && stack.getItem() == Items.SIGN) { + mc.player.inventory.currentItem = slot; + } + } + } +} \ No newline at end of file diff --git a/adapters/v1_11/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_11/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..fbcdd682 --- /dev/null +++ b/adapters/v1_11/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,18 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + @Override + public void renderTileEntityAt(TileEntitySign sign, double x, double y, double z, float partialTicks, int destroyStage) { + // MarumaSign の看板は描かない (画像は WorldPass が描く)。スペクテイターには看板も見せる + if (SignDraw.find(sign) == null || Mc.isSpectator()) { + super.renderTileEntityAt(sign, x, y, z, partialTicks, destroyStage); + } + } +} \ No newline at end of file diff --git a/adapters/v1_12/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_12/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..0b397750 --- /dev/null +++ b/adapters/v1_12/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.block.BlockWallSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.text.TextComponentString; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.12 - 1.12.2 に固有の部分。 + */ +final class Mc { + + static final int MAX_SIGN_LINE_LENGTH = 80; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.world != null && mc.player != null; + } + + static boolean isSpectator() { + return mc.player != null && mc.player.isSpectator(); + } + + static File gameDirectory() { + return mc.gameDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.setRendererDispatcher(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i].getUnformattedText()); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + for (int i = 0; i < 4; i++) { + sign.signText[i] = new TextComponentString(lines[i]); + } + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() instanceof BlockWallSign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.world.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.getPos().getX(); + } + + static double y(TileEntitySign sign) { + return sign.getPos().getY(); + } + + static double z(TileEntitySign sign) { + return sign.getPos().getZ(); + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.world.getCombinedLight(sign.getPos(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.player != null) mc.player.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.player.inventory.mainInventory.get(slot); + if (stack != null && stack.getItem() == Items.SIGN) { + mc.player.inventory.currentItem = slot; + } + } + } +} \ No newline at end of file diff --git a/adapters/v1_12/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_12/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..a021df93 --- /dev/null +++ b/adapters/v1_12/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,18 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + @Override + public void render(TileEntitySign sign, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { + // MarumaSign の看板は描かない (画像は WorldPass が描く)。スペクテイターには看板も見せる + if (SignDraw.find(sign) == null || Mc.isSpectator()) { + super.render(sign, x, y, z, partialTicks, destroyStage, alpha); + } + } +} \ No newline at end of file diff --git a/adapters/v1_14/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_14/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..3147be5d --- /dev/null +++ b/adapters/v1_14/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,101 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.SignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.14 - 1.14.4 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.window; + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return new TextComponent(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(new TextComponent(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof SignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, SignBlockEntity.class); + final SignBlockEntity sign = Reflect.get(signMessages, screen); + for (int i = 0; i < 4; i++) { + sign.setMessage(i, new TextComponent(lines[i])); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.xRot = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.inventory.getItem(slot).getItem() == Items.OAK_SIGN) { + mc.player.inventory.selected = slot; + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_14/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_14/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..fc09df7e --- /dev/null +++ b/adapters/v1_14/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,27 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.GlStateManager; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + minecraft.getTextureManager().bind(texture.id); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.color4f(1f, 1f, 1f, 1f); + GlStateManager.pushMatrix(); + GlStateManager.scalef(unscale, unscale, 1f); + blit(ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + GlStateManager.popMatrix(); + GlStateManager.disableBlend(); + } +} diff --git a/adapters/v1_15/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_15/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..991aa40b --- /dev/null +++ b/adapters/v1_15/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,135 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Matrix4f; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.SignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.15 - 1.15.2 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + // 編集画面が持っている看板のフィールド + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return new TextComponent(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(new TextComponent(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof SignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, SignBlockEntity.class); + final SignBlockEntity sign = Reflect.get(signMessages, screen); + for (int i = 0; i < 4; i++) { + sign.setMessage(i, new TextComponent(lines[i])); + } + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.xRot = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.inventory.getItem(slot).getItem() == Items.OAK_SIGN) { + mc.player.inventory.selected = slot; + } + } + } + + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.xRot = awayFromAxis(mc.player.xRot, true); + mc.player.yRot = awayFromAxis(mc.player.yRot, false); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +} diff --git a/adapters/v1_15/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_15/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..098c8a7e --- /dev/null +++ b/adapters/v1_15/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,26 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + minecraft.getTextureManager().bind(texture.id); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + RenderSystem.pushMatrix(); + RenderSystem.scalef(unscale, unscale, 1f); + blit(ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + RenderSystem.popMatrix(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_16/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_16/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..3158cf89 --- /dev/null +++ b/adapters/v1_16/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,135 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Matrix4f; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.SignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.16 - 1.16.5 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + private static Field signLines; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return new TextComponent(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(new TextComponent(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + if (signLines == null) signLines = Reflect.fieldOfType(SignBlockEntity.class, Component[].class); + final Component[] lines = Reflect.get(signLines, sign); + for (Component line : lines) { + if (line != null) text.append(line.getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof SignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.xRot = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.inventory.getItem(slot).getItem() == Items.OAK_SIGN) { + mc.player.inventory.selected = slot; + } + } + } + + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.xRot = awayFromAxis(mc.player.xRot, true); + mc.player.yRot = awayFromAxis(mc.player.yRot, false); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +} diff --git a/adapters/v1_16/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_16/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..0ee801d5 --- /dev/null +++ b/adapters/v1_16/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,28 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiComponent; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + minecraft.getTextureManager().bind(texture.id); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + poseStack.pushPose(); + poseStack.scale(unscale, unscale, 1f); + GuiComponent.blit(poseStack, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + poseStack.popPose(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..de7596e8 --- /dev/null +++ b/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,132 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Matrix4f; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.SignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.17 - 1.18.2 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return new TextComponent(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(new TextComponent(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof SignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().selected = slot; + } + } + } + + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.setXRot(awayFromAxis(mc.player.getXRot(), true)); + mc.player.setYRot(awayFromAxis(mc.player.getYRot(), false)); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +} diff --git a/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..b74d855b --- /dev/null +++ b/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + } +} diff --git a/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..76ad2c04 --- /dev/null +++ b/adapters/v1_17/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,27 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiComponent; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + RenderSystem.setShaderTexture(0, texture.id); + RenderSystem.enableBlend(); + poseStack.pushPose(); + poseStack.scale(unscale, unscale, 1f); + GuiComponent.blit(poseStack, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + poseStack.popPose(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..efadbb32 --- /dev/null +++ b/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,131 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Matrix4f; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.SignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.19 - 1.19.2 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof SignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().selected = slot; + } + } + } + + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.setXRot(awayFromAxis(mc.player.getXRot(), true)); + mc.player.setYRot(awayFromAxis(mc.player.getYRot(), false)); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +} diff --git a/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..b74d855b --- /dev/null +++ b/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + } +} diff --git a/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..76ad2c04 --- /dev/null +++ b/adapters/v1_19/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,27 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiComponent; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + RenderSystem.setShaderTexture(0, texture.id); + RenderSystem.enableBlend(); + poseStack.pushPose(); + poseStack.scale(unscale, unscale, 1f); + GuiComponent.blit(poseStack, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + poseStack.popPose(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..40307627 --- /dev/null +++ b/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,131 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import org.joml.Matrix4f; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.19.3 - 1.19.4 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().selected = slot; + } + } + } + + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.setXRot(awayFromAxis(mc.player.getXRot(), true)); + mc.player.setYRot(awayFromAxis(mc.player.getYRot(), false)); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +} diff --git a/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..b74d855b --- /dev/null +++ b/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + } +} diff --git a/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..76ad2c04 --- /dev/null +++ b/adapters/v1_19_3/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,27 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiComponent; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + RenderSystem.setShaderTexture(0, texture.id); + RenderSystem.enableBlend(); + poseStack.pushPose(); + poseStack.scale(unscale, unscale, 1f); + GuiComponent.blit(poseStack, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + poseStack.popPose(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..5ea584f8 --- /dev/null +++ b/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,124 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; +import org.joml.Matrix4f; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.20 - 1.20.6 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().selected = slot; + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..b74d855b --- /dev/null +++ b/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + } +} diff --git a/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..12a87e8f --- /dev/null +++ b/adapters/v1_20/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.GuiGraphics; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + RenderSystem.enableBlend(); + graphics.pose().pushPose(); + graphics.pose().scale(unscale, unscale, 1f); + graphics.blit(texture.id, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + graphics.pose().popPose(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..50a35f56 --- /dev/null +++ b/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,122 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.21 - 1.21.1 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final PoseStack.Pose pose = poseStack.last(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.addVertex(pose, mesh[o], mesh[o + 1], mesh[o + 2]) + .setColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .setUv(mesh[o + 3], mesh[o + 4]) + .setLight(light); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().selected = slot; + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..b74d855b --- /dev/null +++ b/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + } +} diff --git a/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..12a87e8f --- /dev/null +++ b/adapters/v1_21/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.GuiGraphics; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + RenderSystem.enableBlend(); + graphics.pose().pushPose(); + graphics.pose().scale(unscale, unscale, 1f); + graphics.blit(texture.id, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + graphics.pose().popPose(); + RenderSystem.disableBlend(); + } +} diff --git a/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..93724a4a --- /dev/null +++ b/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,122 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.21.2 - 1.21.4 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final PoseStack.Pose pose = poseStack.last(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.addVertex(pose, mesh[o], mesh[o + 1], mesh[o + 2]) + .setColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .setUv(mesh[o + 3], mesh[o + 4]) + .setLight(light); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().selected = slot; + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..b74d855b --- /dev/null +++ b/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + } +} diff --git a/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..697af6fd --- /dev/null +++ b/adapters/v1_21_2/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,23 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderType; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + graphics.pose().pushPose(); + graphics.pose().scale(unscale, unscale, 1f); + graphics.blit(RenderType::guiTextured, texture.id, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + graphics.pose().popPose(); + } +} diff --git a/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..9653a6b6 --- /dev/null +++ b/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,122 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.21.5 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().getName(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final PoseStack.Pose pose = poseStack.last(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.addVertex(pose, mesh[o], mesh[o + 1], mesh[o + 2]) + .setColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .setUv(mesh[o + 3], mesh[o + 4]) + .setLight(light); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().setSelectedSlot(slot); + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..4c7eeef7 --- /dev/null +++ b/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.phys.Vec3; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay, Vec3 cameraPosition) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay, cameraPosition); + } + } +} diff --git a/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..697af6fd --- /dev/null +++ b/adapters/v1_21_5/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,23 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderType; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + graphics.pose().pushPose(); + graphics.pose().scale(unscale, unscale, 1f); + graphics.blit(RenderType::guiTextured, texture.id, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + graphics.pose().popPose(); + } +} diff --git a/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..cd2fcee9 --- /dev/null +++ b/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,122 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.21.6 - 1.21.8 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().name(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc"); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) { + final PoseStack.Pose pose = poseStack.last(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.addVertex(pose, mesh[o], mesh[o + 1], mesh[o + 2]) + .setColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .setUv(mesh[o + 3], mesh[o + 4]) + .setLight(light); + } + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().setSelectedSlot(slot); + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..4c7eeef7 --- /dev/null +++ b/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.phys.Vec3; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay, Vec3 cameraPosition) { + if (drawImage(sign, poseStack, buffers, light)) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay, cameraPosition); + } + } +} diff --git a/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..67dbf5c3 --- /dev/null +++ b/adapters/v1_21_6/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,23 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.gui.GuiGraphics; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + graphics.pose().pushMatrix(); + graphics.pose().scale(unscale, unscale); + graphics.blit(texture.id, + ui.originX(), ui.originY(), ui.originX() + ui.pixelWidth(), ui.originY() + ui.pixelHeight(), + 0f, 1f, 0f, 1f); + graphics.pose().popMatrix(); + } +} diff --git a/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..324ec15d --- /dev/null +++ b/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,104 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 1.21.9 - 1.21.11 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().name(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, KeyMapping.Category.MISC); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().setSelectedSlot(slot); + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..416eeb68 --- /dev/null +++ b/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,25 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import net.minecraft.client.renderer.state.CameraRenderState; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void submit(State state, PoseStack poseStack, SubmitNodeCollector collector, CameraRenderState camera) { + if (drawsVanilla(state)) delegate.submit(state.inner, poseStack, collector, camera); + // このバージョンのカメラの状態は視錐台を持たないため、カリングは描画側に任せる + submitImage(state, poseStack, collector, null); + } +} diff --git a/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..67dbf5c3 --- /dev/null +++ b/adapters/v1_21_9/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,23 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.gui.GuiGraphics; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + graphics.pose().pushMatrix(); + graphics.pose().scale(unscale, unscale); + graphics.blit(texture.id, + ui.originX(), ui.originY(), ui.originX() + ui.pixelWidth(), ui.originY() + ui.pixelHeight(), + 0f, 1f, 0f, 1f); + graphics.pose().popMatrix(); + } +} diff --git a/adapters/v1_7/forge/java/marumasa/marumasa_sign/adapter/Entry.java b/adapters/v1_7/forge/java/marumasa/marumasa_sign/adapter/Entry.java new file mode 100644 index 00000000..dfddd28b --- /dev/null +++ b/adapters/v1_7/forge/java/marumasa/marumasa_sign/adapter/Entry.java @@ -0,0 +1,37 @@ +package marumasa.marumasa_sign.adapter; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.common.MinecraftForge; + +/** + * Forge 1.7.10 から起動されたときの入口。 + */ +public final class Entry { + + public static void start() { + // クライアント専用 + if (FMLCommonHandler.instance().getSide() != Side.CLIENT) return; + if (!Adapter.init("forge")) return; + // 看板アイテムの見た目は、Forge の仕組みで差し替える + ForgeInstaller.install(); + SignItems.handledByLoader = true; + // 1.7.10 では tick のイベントは FML のバスに、描画のイベントは Forge のバスに流れる + final Entry entry = new Entry(); + FMLCommonHandler.instance().bus().register(entry); + MinecraftForge.EVENT_BUS.register(entry); + } + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase == TickEvent.Phase.END) Adapter.tick(); + } + + @SubscribeEvent + public void onRenderWorldLast(RenderWorldLastEvent event) { + Adapter.renderWorld(); + } +} diff --git a/adapters/v1_7/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_7/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..622fc16a --- /dev/null +++ b/adapters/v1_7/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.ChatComponentText; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.7.10 に固有の部分。 + */ +final class Mc { + + // 1.7.10 のサーバーは 1 行が 15 文字を超える看板を受け付けない + static final int MAX_SIGN_LINE_LENGTH = 15; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.theWorld != null && mc.thePlayer != null; + } + + // 1.7.10 にスペクテイターモードはない + static boolean isSpectator() { + return false; + } + + static File gameDirectory() { + return mc.mcDataDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.func_147497_a(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i]); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + System.arraycopy(lines, 0, sign.signText, 0, 4); + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() == Blocks.wall_sign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.theWorld.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.xCoord; + } + + static double y(TileEntitySign sign) { + return sign.yCoord; + } + + static double z(TileEntitySign sign) { + return sign.zCoord; + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(0.0); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(0.0); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.theWorld.getLightBrightnessForSkyBlocks(sign.xCoord, sign.yCoord, sign.zCoord, 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.thePlayer != null) mc.thePlayer.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.thePlayer.inventory.mainInventory[slot]; + if (stack != null && stack.getItem() == Items.sign) { + mc.thePlayer.inventory.currentItem = slot; + } + } + } +} diff --git a/adapters/v1_7/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_7/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..2a4d28b8 --- /dev/null +++ b/adapters/v1_7/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,18 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + @Override + public void renderTileEntityAt(TileEntitySign sign, double x, double y, double z, float partialTicks) { + // MarumaSign の看板は描かない (画像は WorldPass が描く) + if (SignDraw.find(sign) == null) { + super.renderTileEntityAt(sign, x, y, z, partialTicks); + } + } +} diff --git a/adapters/v1_8/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_8/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..6939846d --- /dev/null +++ b/adapters/v1_8/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.block.BlockWallSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.ChatComponentText; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.8.8 - 1.8.9 に固有の部分。 + */ +final class Mc { + + static final int MAX_SIGN_LINE_LENGTH = 80; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.theWorld != null && mc.thePlayer != null; + } + + static boolean isSpectator() { + return mc.thePlayer != null && mc.thePlayer.isSpectator(); + } + + static File gameDirectory() { + return mc.mcDataDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.setRendererDispatcher(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i].getUnformattedText()); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + for (int i = 0; i < 4; i++) { + sign.signText[i] = new ChatComponentText(lines[i]); + } + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() instanceof BlockWallSign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.theWorld.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.getPos().getX(); + } + + static double y(TileEntitySign sign) { + return sign.getPos().getY(); + } + + static double z(TileEntitySign sign) { + return sign.getPos().getZ(); + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.theWorld.getCombinedLight(sign.getPos(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.thePlayer != null) mc.thePlayer.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.thePlayer.inventory.mainInventory[slot]; + if (stack != null && stack.getItem() == Items.sign) { + mc.thePlayer.inventory.currentItem = slot; + } + } + } +} \ No newline at end of file diff --git a/adapters/v1_8/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_8/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..fbcdd682 --- /dev/null +++ b/adapters/v1_8/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,18 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + @Override + public void renderTileEntityAt(TileEntitySign sign, double x, double y, double z, float partialTicks, int destroyStage) { + // MarumaSign の看板は描かない (画像は WorldPass が描く)。スペクテイターには看板も見せる + if (SignDraw.find(sign) == null || Mc.isSpectator()) { + super.renderTileEntityAt(sign, x, y, z, partialTicks, destroyStage); + } + } +} \ No newline at end of file diff --git a/adapters/v1_8_0/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_8_0/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..ba932556 --- /dev/null +++ b/adapters/v1_8_0/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.block.BlockWallSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.ChatComponentText; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.8 に固有の部分。 + */ +final class Mc { + + static final int MAX_SIGN_LINE_LENGTH = 80; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.theWorld != null && mc.thePlayer != null; + } + + static boolean isSpectator() { + return mc.thePlayer != null && mc.thePlayer.isSpectator(); + } + + static File gameDirectory() { + return mc.mcDataDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.setRendererDispatcher(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i].getUnformattedText()); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + for (int i = 0; i < 4; i++) { + sign.signText[i] = new ChatComponentText(lines[i]); + } + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() instanceof BlockWallSign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.theWorld.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.getPos().getX(); + } + + static double y(TileEntitySign sign) { + return sign.getPos().getY(); + } + + static double z(TileEntitySign sign) { + return sign.getPos().getZ(); + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.theWorld.getCombinedLight(sign.getPos(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.thePlayer != null) mc.thePlayer.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.thePlayer.inventory.mainInventory[slot]; + if (stack != null && stack.getItem() == Items.sign) { + mc.thePlayer.inventory.currentItem = slot; + } + } + } +} \ No newline at end of file diff --git a/adapters/v1_8_0/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_8_0/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..2e57cb44 --- /dev/null +++ b/adapters/v1_8_0/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,19 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + // Minecraft 1.8 では、看板を描くメソッドに分かりやすい名前が付いていない + @Override + public void func_180541_a(TileEntitySign sign, double x, double y, double z, float partialTicks, int destroyStage) { + // MarumaSign の看板は描かない (画像は WorldPass が描く)。スペクテイターには看板も見せる + if (SignDraw.find(sign) == null || Mc.isSpectator()) { + super.func_180541_a(sign, x, y, z, partialTicks, destroyStage); + } + } +} diff --git a/adapters/v1_9/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v1_9/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..89dd7b53 --- /dev/null +++ b/adapters/v1_9/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,116 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.block.BlockWallSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.text.TextComponentString; + +import java.io.File; +import java.util.List; + +/** + * Minecraft 1.9 - 1.9.4 に固有の部分。 + */ +final class Mc { + + static final int MAX_SIGN_LINE_LENGTH = 80; + + private static final Minecraft mc = Minecraft.getMinecraft(); + + private Mc() { + } + + static boolean inWorld() { + return mc.theWorld != null && mc.thePlayer != null; + } + + static boolean isSpectator() { + return mc.thePlayer != null && mc.thePlayer.isSpectator(); + } + + static File gameDirectory() { + return mc.mcDataDir; + } + + static void execute(Runnable task) { + mc.addScheduledTask(task); + } + + static void chat(String message) { + mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(message)); + } + + static void attach(SignRenderer renderer, TileEntityRendererDispatcher dispatcher) { + renderer.setRendererDispatcher(dispatcher); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(TileEntitySign sign) { + final StringBuilder text = new StringBuilder(); + for (int i = 0; i < 4; i++) { + if (sign.signText[i] != null) text.append(sign.signText[i].getUnformattedText()); + } + return text.toString(); + } + + static void setSignText(TileEntitySign sign, String[] lines) { + for (int i = 0; i < 4; i++) { + sign.signText[i] = new TextComponentString(lines[i]); + } + } + + static boolean isWallSign(TileEntitySign sign) { + return sign.getBlockType() instanceof BlockWallSign; + } + + // ---------- ワールドへの描画 ---------- + + static List tileEntities() { + return mc.theWorld.loadedTileEntityList; + } + + static double x(TileEntitySign sign) { + return sign.getPos().getX(); + } + + static double y(TileEntitySign sign) { + return sign.getPos().getY(); + } + + static double z(TileEntitySign sign) { + return sign.getPos().getZ(); + } + + static void enableLightmap() { + mc.entityRenderer.enableLightmap(); + } + + static void disableLightmap() { + mc.entityRenderer.disableLightmap(); + } + + static void applyLight(TileEntitySign sign) { + final int light = mc.theWorld.getCombinedLight(sign.getPos(), 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, light % 65536, light / 65536); + } + + // ---------- 動作確認用 ---------- + + static void look(float pitch) { + if (mc.thePlayer != null) mc.thePlayer.rotationPitch = pitch; + } + + // ホットバーにある看板を手に持つ + static void selectSign() { + for (int slot = 0; slot < 9; slot++) { + final ItemStack stack = mc.thePlayer.inventory.mainInventory[slot]; + if (stack != null && stack.getItem() == Items.SIGN) { + mc.thePlayer.inventory.currentItem = slot; + } + } + } +} \ No newline at end of file diff --git a/adapters/v1_9/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java b/adapters/v1_9/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java new file mode 100644 index 00000000..fbcdd682 --- /dev/null +++ b/adapters/v1_9/main/java/marumasa/marumasa_sign/adapter/SignRenderer.java @@ -0,0 +1,18 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; +import net.minecraft.tileentity.TileEntitySign; + +/** + * 看板のレンダラー。MarumaSign の看板なら、看板を描かない。 + */ +final class SignRenderer extends TileEntitySignRenderer { + + @Override + public void renderTileEntityAt(TileEntitySign sign, double x, double y, double z, float partialTicks, int destroyStage) { + // MarumaSign の看板は描かない (画像は WorldPass が描く)。スペクテイターには看板も見せる + if (SignDraw.find(sign) == null || Mc.isSpectator()) { + super.renderTileEntityAt(sign, x, y, z, partialTicks, destroyStage); + } + } +} \ No newline at end of file diff --git a/adapters/v26/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java b/adapters/v26/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java new file mode 100644 index 00000000..8f7247bb --- /dev/null +++ b/adapters/v26/main/java/marumasa/marumasa_sign/adapter/SignRendererWrapper.java @@ -0,0 +1,24 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import net.minecraft.client.renderer.state.level.CameraRenderState; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase { + + SignRendererWrapper(BlockEntityRenderer delegate) { + super(delegate); + } + + @Override + public void submit(State state, PoseStack poseStack, SubmitNodeCollector collector, CameraRenderState camera) { + if (drawsVanilla(state)) delegate.submit(state.inner, poseStack, collector, camera); + submitImage(state, poseStack, collector, camera.cullFrustum); + } +} diff --git a/adapters/v26/main/java/marumasa/marumasa_sign/adapter/UiScreen.java b/adapters/v26/main/java/marumasa/marumasa_sign/adapter/UiScreen.java new file mode 100644 index 00000000..ffe4dfe2 --- /dev/null +++ b/adapters/v26/main/java/marumasa/marumasa_sign/adapter/UiScreen.java @@ -0,0 +1,23 @@ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.gui.GuiGraphicsExtractor; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + graphics.pose().pushMatrix(); + graphics.pose().scale(unscale, unscale); + graphics.blit(texture.id, + ui.originX(), ui.originY(), ui.originX() + ui.pixelWidth(), ui.originY() + ui.pixelHeight(), + 0f, 1f, 0f, 1f); + graphics.pose().popMatrix(); + } +} diff --git a/adapters/v26_1/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v26_1/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..9c9ce44e --- /dev/null +++ b/adapters/v26_1/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,104 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 26.1 - 26.1.2 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityType.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().name(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.screen; + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.getChat().addClientSystemMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, KeyMapping.Category.MISC); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().setSelectedSlot(slot); + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v26_2/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v26_2/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..6c4da95d --- /dev/null +++ b/adapters/v26_2/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,105 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.BlockEntityTypes; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignText; + +import java.lang.reflect.Field; + +/** + * Minecraft 26.2 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityTypes.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().name(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.gui.screen(); + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.gui.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.hud.getChat().addClientSystemMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, KeyMapping.Category.MISC); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().setSelectedSlot(slot); + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/adapters/v26_3/main/java/marumasa/marumasa_sign/adapter/Mc.java b/adapters/v26_3/main/java/marumasa/marumasa_sign/adapter/Mc.java new file mode 100644 index 00000000..712d5f8f --- /dev/null +++ b/adapters/v26_3/main/java/marumasa/marumasa_sign/adapter/Mc.java @@ -0,0 +1,103 @@ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.SharedConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.BlockEntityTypes; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignTextSlot; + +import java.lang.reflect.Field; + +/** + * Minecraft 26.3 に固有の部分。 + */ +final class Mc { + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = BlockEntityTypes.SIGN; + + private static Field signMessages; + + private Mc() { + } + + static String version() { + return SharedConstants.getCurrentVersion().name(); + } + + static Window window(Minecraft mc) { + return mc.getWindow(); + } + + static Screen screen(Minecraft mc) { + return mc.gui.screen(); + } + + static void setScreen(Minecraft mc, Screen screen) { + mc.gui.setScreen(screen); + } + + static Component text(String text) { + return Component.literal(text); + } + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) { + mc.gui.hud.getChat().addClientSystemMessage(Component.literal(message)); + } + + static KeyMapping newKey(String name, int keyCode) { + return new KeyMapping(name, InputConstants.Type.KEYBOARD, keyCode, KeyMapping.Category.MISC); + } + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) { + final StringBuilder text = new StringBuilder(); + // 表、裏の順に並んでいる + for (SignTextSlot slot : SignTextSlot.values()) { + for (Component line : sign.getText(slot).getMessages(false)) { + text.append(line.getString()); + } + } + return text.toString(); + } + + static boolean isSignEdit(Screen screen) { + return screen instanceof AbstractSignEditScreen; + } + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) { + if (signMessages == null) signMessages = Reflect.fieldOfType(AbstractSignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + } + + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) { + mc.player.setXRot(pitch); + } + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) { + for (int slot = 0; slot < 9; slot++) { + if (mc.player.getInventory().getItem(slot).is(Items.OAK_SIGN)) { + mc.player.getInventory().setSelectedSlot(slot); + } + } + } + + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +} diff --git a/bootstrap/build.gradle b/bootstrap/build.gradle new file mode 100644 index 00000000..99f521ec --- /dev/null +++ b/bootstrap/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' +} + +// 各ローダーが Mod を見つけるための入口クラスだけを置くモジュール。 +// ローダーのアノテーションは stubs に最小限の定義を置き、コンパイルにだけ使う (jar には入れない)。 +sourceSets { + stubs +} + +repositories { + mavenCentral() +} + +dependencies { + compileOnly sourceSets.stubs.output + compileOnly project(':core') + compileOnly 'org.apache.logging.log4j:log4j-api:2.0-beta9' +} + +tasks.withType(JavaCompile).configureEach { + options.release = 8 +} + +// ソースに埋め込むバージョン情報 +def generatedDir = layout.buildDirectory.dir('generated/bootinfo') +def generateBootInfo = tasks.register('generateBootInfo') { + def modVersion = project.version.toString() + def outputDir = generatedDir + inputs.property('version', modVersion) + outputs.dir(outputDir) + doLast { + def file = new File(outputDir.get().asFile, 'marumasa/marumasa_sign/boot/BootInfo.java') + file.parentFile.mkdirs() + file.setText("package marumasa.marumasa_sign.boot;\n\npublic final class BootInfo {\n" + + " public static final String VERSION = \"${modVersion}\";\n\n" + + " private BootInfo() {\n }\n}\n", 'UTF-8') + } +} +sourceSets.main.java.srcDir(generateBootInfo) diff --git a/bootstrap/src/main/java/marumasa/marumasa_sign/boot/Boot.java b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/Boot.java new file mode 100644 index 00000000..886167a7 --- /dev/null +++ b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/Boot.java @@ -0,0 +1,113 @@ +package marumasa.marumasa_sign.boot; + +import marumasa.marumasa_sign.core.MarumaSign; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; +import java.util.Properties; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 実行中の Minecraft のバージョンに合った実装を選んで起動する。 + * この jar には全バージョン分の実装が入っているため、合うものだけを読み込む。 + */ +public final class Boot { + + private static boolean started; + + private Boot() { + } + + public static synchronized void start(String loader, String minecraftVersion) { + if (started) return; + started = true; + + if (minecraftVersion == null) { + MarumaSign.LOGGER.error("Could not detect the Minecraft version. MarumaSign is disabled."); + return; + } + final String target = loadTable().getProperty(loader + "." + minecraftVersion); + if (target == null) { + MarumaSign.LOGGER.error("MarumaSign does not support Minecraft " + minecraftVersion + " on " + loader + "."); + return; + } + try { + Class.forName("marumasa.marumasa_sign." + loader + "." + target + ".Entry").getMethod("start").invoke(null); + } catch (ReflectiveOperationException | LinkageError e) { + MarumaSign.LOGGER.error("Failed to start MarumaSign for Minecraft " + minecraftVersion + " on " + loader, e); + } + } + + // 「ローダー.バージョン = 実装の名前」の対応表 + private static Properties loadTable() { + final Properties table = new Properties(); + final InputStream stream = Boot.class.getResourceAsStream("/marumasa_sign/targets.properties"); + if (stream == null) return table; + try { + try { + table.load(new InputStreamReader(stream, StandardCharsets.UTF_8)); + } finally { + stream.close(); + } + } catch (IOException e) { + MarumaSign.LOGGER.error("Failed to load the target table", e); + } + return table; + } + + // ---------- バージョンの検出 ---------- + // ローダーの API はバージョンごとに違うので、リフレクションで順に試す + + static String staticField(String className, String fieldName) { + try { + final Field field = Class.forName(className).getField(fieldName); + final Object value = field.get(null); + return value == null ? null : value.toString(); + } catch (ReflectiveOperationException | LinkageError e) { + return null; + } + } + + // クラスの static メソッドを呼び、その結果に対して残りのメソッドを順に呼ぶ + static String staticChain(String className, String... methodNames) { + try { + Object value = null; + Class type = Class.forName(className); + for (String name : methodNames) { + final Method method = type.getMethod(name); + value = method.invoke(value); + if (value == null) return null; + type = value.getClass(); + } + return value == null ? null : value.toString(); + } catch (ReflectiveOperationException | LinkageError e) { + return null; + } + } + + private static final Pattern VERSION_ID = Pattern.compile("\"id\"\\s*:\\s*\"([^\"]+)\""); + + // Minecraft 1.14 以降の jar に入っている version.json から読む + static String fromVersionJson() { + final InputStream stream = Boot.class.getClassLoader().getResourceAsStream("version.json"); + if (stream == null) return null; + try { + try { + final byte[] buffer = new byte[4096]; + final int length = stream.read(buffer); + if (length <= 0) return null; + final Matcher matcher = VERSION_ID.matcher(new String(buffer, 0, length, StandardCharsets.UTF_8)); + return matcher.find() ? matcher.group(1) : null; + } finally { + stream.close(); + } + } catch (IOException e) { + return null; + } + } +} diff --git a/bootstrap/src/main/java/marumasa/marumasa_sign/boot/ForgeMod.java b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/ForgeMod.java new file mode 100644 index 00000000..2f191ce8 --- /dev/null +++ b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/ForgeMod.java @@ -0,0 +1,33 @@ +package marumasa.marumasa_sign.boot; + +import net.minecraftforge.fml.common.Mod; + +/** + * Forge 1.8 以降の入口。 + * メソッドやフィールドに Forge や Minecraft の型を使わないこと + * (古い Forge はこのクラスの全メソッドをリフレクションで調べるため)。 + */ +@Mod( + value = "marumasa_sign", + modid = "marumasa_sign", + name = "MarumaSign", + version = BootInfo.VERSION, + clientSideOnly = true, + acceptableRemoteVersions = "*" +) +public final class ForgeMod { + + public ForgeMod() { + Boot.start("forge", minecraftVersion()); + } + + private static String minecraftVersion() { + // 1.13 以降 + String version = Boot.staticChain("net.minecraftforge.versions.mcp.MCPVersion", "getMCVersion"); + // 1.8 - 1.12.2 + if (version == null) version = Boot.staticField("net.minecraftforge.fml.common.Loader", "MC_VERSION"); + if (version == null) version = Boot.staticChain("net.minecraftforge.fml.loading.FMLLoader", "versionInfo", "mcVersion"); + if (version == null) version = Boot.fromVersionJson(); + return version; + } +} diff --git a/bootstrap/src/main/java/marumasa/marumasa_sign/boot/LegacyFmlMod.java b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/LegacyFmlMod.java new file mode 100644 index 00000000..cc437826 --- /dev/null +++ b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/LegacyFmlMod.java @@ -0,0 +1,19 @@ +package marumasa.marumasa_sign.boot; + +import cpw.mods.fml.common.Mod; + +/** + * Forge 1.7.10 の入口。 + */ +@Mod( + modid = "marumasa_sign", + name = "MarumaSign", + version = BootInfo.VERSION, + acceptableRemoteVersions = "*" +) +public final class LegacyFmlMod { + + public LegacyFmlMod() { + Boot.start("forge", Boot.staticField("cpw.mods.fml.common.Loader", "MC_VERSION")); + } +} diff --git a/bootstrap/src/main/java/marumasa/marumasa_sign/boot/NeoForgeMod.java b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/NeoForgeMod.java new file mode 100644 index 00000000..3c064af0 --- /dev/null +++ b/bootstrap/src/main/java/marumasa/marumasa_sign/boot/NeoForgeMod.java @@ -0,0 +1,21 @@ +package marumasa.marumasa_sign.boot; + +import net.neoforged.fml.common.Mod; + +/** + * NeoForge の入口。 + */ +@Mod("marumasa_sign") +public final class NeoForgeMod { + + public NeoForgeMod() { + Boot.start("neoforge", minecraftVersion()); + } + + private static String minecraftVersion() { + String version = Boot.staticChain("net.neoforged.fml.loading.FMLLoader", "versionInfo", "mcVersion"); + if (version == null) version = Boot.staticChain("net.neoforged.fml.loading.FMLLoader", "getCurrent", "getVersionInfo", "mcVersion"); + if (version == null) version = Boot.fromVersionJson(); + return version; + } +} diff --git a/bootstrap/src/stubs/java/cpw/mods/fml/common/Mod.java b/bootstrap/src/stubs/java/cpw/mods/fml/common/Mod.java new file mode 100644 index 00000000..b4379ca2 --- /dev/null +++ b/bootstrap/src/stubs/java/cpw/mods/fml/common/Mod.java @@ -0,0 +1,21 @@ +package cpw.mods.fml.common; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * コンパイル用の定義 (Forge 1.7.10)。 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Mod { + String modid(); + + String name() default ""; + + String version() default ""; + + String acceptableRemoteVersions() default ""; +} diff --git a/bootstrap/src/stubs/java/net/minecraftforge/fml/common/Mod.java b/bootstrap/src/stubs/java/net/minecraftforge/fml/common/Mod.java new file mode 100644 index 00000000..bf9ad9e0 --- /dev/null +++ b/bootstrap/src/stubs/java/net/minecraftforge/fml/common/Mod.java @@ -0,0 +1,27 @@ +package net.minecraftforge.fml.common; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * コンパイル用の定義。 + * Forge 1.8 - 1.12.2 は modid を、1.13 以降は value を読むため、両方を持たせている。 + * 実行時には各バージョンの本物のアノテーションが使われ、知らない要素は無視される。 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Mod { + String value() default ""; + + String modid() default ""; + + String name() default ""; + + String version() default ""; + + boolean clientSideOnly() default false; + + String acceptableRemoteVersions() default ""; +} diff --git a/bootstrap/src/stubs/java/net/neoforged/fml/common/Mod.java b/bootstrap/src/stubs/java/net/neoforged/fml/common/Mod.java new file mode 100644 index 00000000..76fa9542 --- /dev/null +++ b/bootstrap/src/stubs/java/net/neoforged/fml/common/Mod.java @@ -0,0 +1,15 @@ +package net.neoforged.fml.common; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * コンパイル用の定義 (NeoForge)。 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Mod { + String value(); +} diff --git a/build.gradle b/build.gradle index 73e215d3..89a96c80 100644 --- a/build.gradle +++ b/build.gradle @@ -1,109 +1,44 @@ plugins { - id 'net.fabricmc.fabric-loom' version '1.17.14' - id 'maven-publish' + id 'xyz.wagyourtail.unimined' apply false } -version = project.mod_version -group = project.maven_group - -repositories { - mavenCentral() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } +def targetTable = new groovy.json.JsonSlurper().parse(file('targets.json')) +// 各ビルド対象に、世代 (era) ごとの共通設定を合わせたもの +def marumaOnly = (providers.gradleProperty('marumaOnly').orNull ?: '').tokenize(',') +ext.marumaTargets = targetTable.targets.findAll { + marumaOnly.isEmpty() || it.name in marumaOnly +}.collect { target -> + def era = targetTable.eras[target.era] + if (era == null) throw new GradleException("Unknown era '${target.era}' in targets.json") + era + target } -dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - implementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modCompileClasspath "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - localRuntime "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +allprojects { + version = rootProject.mod_version + group = rootProject.maven_group } -tasks.withType(JavaExec).configureEach { - if (name.startsWith("run")) { - doFirst { - systemProperty "fabric.addMods", configurations.localRuntime.asPath +subprojects { + plugins.withId('java') { + java { + toolchain { + languageVersion = JavaLanguageVersion.of(rootProject.compile_jdk as int) + } } - } -} - -processResources { - inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version - inputs.property "loader_version", project.loader_version - filteringCharset "UTF-8" - filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minecraft_version, - "loader_version": project.loader_version - } -} - -def targetJavaVersion = 25 -tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - it.options.release = targetJavaVersion - } -} - -base { - archivesName = project.archives_base_name -} - -loom { - mods { - "marumasa_sign" { - sourceSet sourceSets.main + tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + // 古いローダーは jar 内の全クラスを古い ASM で走査するため、 + // すべてのクラスを Java 8 形式 (major 52) で出力する + options.compilerArgs += ['-Xlint:-options'] } } } -// sourceSets block removed - -java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() -} - -jar { - from("LICENSE") { - rename { "${it}_${project.archives_base_name}"} - } -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. +// targets.json の各項目に共通のビルド設定を適用する +marumaTargets.each { target -> + project(":targets:${target.name}") { + ext.spec = target + apply from: rootProject.file('gradle/target.gradle') } } - -// afterEvaluate block removed diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 00000000..2457a147 --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'java-library' +} + +repositories { + mavenCentral() +} + +dependencies { + // 1.7.10 に同梱されている版。これより新しい API は使わない + compileOnly 'org.apache.logging.log4j:log4j-api:2.0-beta9' + testImplementation 'org.apache.logging.log4j:log4j-api:2.0-beta9' +} + +// Minecraft を起動せずに画面の見た目を PNG に書き出す +tasks.register('uiPreview', JavaExec) { + classpath = sourceSets.test.runtimeClasspath + mainClass = 'marumasa.marumasa_sign.core.UiPreview' + javaLauncher = javaToolchains.launcherFor(java.toolchain) + args = [layout.buildDirectory.dir('ui-preview').get().asFile.path, + providers.gradleProperty('previewLang').getOrElse('ja_jp'), + providers.gradleProperty('previewScale').getOrElse('2')] + + (providers.gradleProperty('previewImage').isPresent() ? [providers.gradleProperty('previewImage').get()] : []) +} + +// Minecraft を起動せずに 3D モデルを PNG に描く。引数は -PgltfArgs="出力先 時刻 モデルのファイル..." で渡す +tasks.register('gltfCheck', JavaExec) { + classpath = sourceSets.test.runtimeClasspath + mainClass = 'marumasa.marumasa_sign.core.gltf.GltfCheck' + javaLauncher = javaToolchains.launcherFor(java.toolchain) + args = providers.gradleProperty('gltfArgs').getOrElse('').tokenize(' ') +} + +tasks.withType(JavaCompile).configureEach { + // Minecraft に依存しないので JDK 8 の API だけに制限する + options.release = 8 +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/Config.java b/core/src/main/java/marumasa/marumasa_sign/core/Config.java new file mode 100644 index 00000000..efff9751 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/Config.java @@ -0,0 +1,102 @@ +package marumasa.marumasa_sign.core; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public final class Config { + + public static final int MIN_THREADS = 1; + public static final int MAX_THREADS = 32; + + private final File file; + + private int maxThreads = 5; + private String lastDirectory = ""; + private int volume = 100; + + Config(File gameDirectory) { + this.file = new File(new File(gameDirectory, "config"), MarumaSign.MOD_ID + ".json"); + if (file.exists()) { + deserialize(); + } else { + serialize(); + } + } + + // 画像の同時ロード数 設定 + public void setMaxThreads(int value) { + maxThreads = Math.max(MIN_THREADS, Math.min(MAX_THREADS, value)); + serialize(); + } + + // 画像の同時ロード数 取得 + public int getMaxThreads() { + return maxThreads; + } + + // 動画や音声の音量 (0 - 100) + public int getVolume() { + return volume; + } + + public void setVolume(int value) { + volume = Math.max(0, Math.min(100, value)); + serialize(); + } + + // 最後に画像を選んだフォルダ + public String getLastDirectory() { + return lastDirectory; + } + + public void setLastDirectory(String value) { + if (value == null) value = ""; + if (value.equals(lastDirectory)) return; + lastDirectory = value; + serialize(); + } + + private static final Pattern MAX_THREADS_PATTERN = Pattern.compile("\"MaxThreads\"\\s*:\\s*(-?\\d+)"); + private static final Pattern VOLUME_PATTERN = Pattern.compile("\"Volume\"\\s*:\\s*(-?\\d+)"); + private static final Pattern LAST_DIRECTORY_PATTERN = Pattern.compile("\"LastDirectory\"\\s*:\\s*\"((?:\\\\.|[^\"\\\\])*)\""); + + private void deserialize() { + try { + final String json = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); + + Matcher matcher = MAX_THREADS_PATTERN.matcher(json); + if (matcher.find()) { + maxThreads = Math.max(MIN_THREADS, Math.min(MAX_THREADS, Integer.parseInt(matcher.group(1)))); + } + matcher = VOLUME_PATTERN.matcher(json); + if (matcher.find()) { + volume = Math.max(0, Math.min(100, Integer.parseInt(matcher.group(1)))); + } + matcher = LAST_DIRECTORY_PATTERN.matcher(json); + if (matcher.find()) { + lastDirectory = matcher.group(1).replace("\\\"", "\"").replace("\\\\", "\\"); + } + } catch (IOException | RuntimeException e) { + MarumaSign.LOGGER.error("Failed to deserialize config", e); + } + } + + private void serialize() { + try { + final File parent = file.getParentFile(); + if (parent != null && !parent.isDirectory() && !parent.mkdirs()) { + throw new IOException("Cannot create directory: " + parent); + } + final String json = "{\"MaxThreads\":" + maxThreads + + ",\"Volume\":" + volume + + ",\"LastDirectory\":\"" + lastDirectory.replace("\\", "\\\\").replace("\"", "\\\"") + "\"}"; + Files.write(file.toPath(), json.getBytes(StandardCharsets.UTF_8)); + } catch (IOException | RuntimeException e) { + MarumaSign.LOGGER.error("Failed to serialize config", e); + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/Lang.java b/core/src/main/java/marumasa/marumasa_sign/core/Lang.java new file mode 100644 index 00000000..49e627ec --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/Lang.java @@ -0,0 +1,69 @@ +package marumasa.marumasa_sign.core; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Locale; +import java.util.Properties; + +/** + * 画面やメッセージの翻訳。 + * リソースパックの仕組みはバージョンごとに異なるため、core が自前で読み込む。 + */ +public final class Lang { + + private static final String DEFAULT_LANGUAGE = "en_us"; + + private static final Properties fallback = load(DEFAULT_LANGUAGE); + // チャットに表示するメッセージの、全言語分の翻訳 + private static final Properties chat = load("chat"); + private static Properties current = fallback; + private static String currentCode = DEFAULT_LANGUAGE; + + private Lang() { + } + + private static Properties load(String code) { + final Properties properties = new Properties(); + final InputStream stream = Lang.class.getResourceAsStream("/marumasa_sign/lang/" + code + ".properties"); + if (stream == null) return null; + try { + try { + properties.load(new InputStreamReader(stream, StandardCharsets.UTF_8)); + } finally { + stream.close(); + } + } catch (IOException e) { + MarumaSign.LOGGER.error("Failed to load language: " + code, e); + } + return properties; + } + + // Minecraft で選択中の言語に切り替える + public static synchronized void select(String code) { + code = code == null ? DEFAULT_LANGUAGE : code.toLowerCase(Locale.ROOT); + if (code.equals(currentCode)) return; + currentCode = code; + final Properties loaded = load(code); + // 画面の翻訳がない言語でも、チャットのメッセージだけは chat から引けるように空の表にする + current = loaded != null ? loaded : new Properties(); + } + + public static synchronized String get(String key) { + String value = current.getProperty(key); + if (value == null) value = chat.getProperty(currentCode + "." + key); + if (value == null) { + // 翻訳がない言語は、近い言語の翻訳を使う + final String alias = chat.getProperty("alias." + currentCode); + if (alias != null) value = chat.getProperty(alias + "." + key); + } + if (value == null) value = fallback.getProperty(key); + if (value == null) value = chat.getProperty(DEFAULT_LANGUAGE + "." + key); + return value != null ? value : key; + } + + public static String get(String key, Object... args) { + return String.format(Locale.ROOT, get(key), args); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/MarumaSign.java b/core/src/main/java/marumasa/marumasa_sign/core/MarumaSign.java new file mode 100644 index 00000000..39351de4 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/MarumaSign.java @@ -0,0 +1,191 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.image.ImageLoader; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.sign.SignManager; +import marumasa.marumasa_sign.core.sign.SignSpec; +import marumasa.marumasa_sign.core.sign.SignText; +import marumasa.marumasa_sign.core.ui.UiRoot; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * Minecraft のバージョンに依存しない、MarumaSign の本体。 + * 各バージョンの実装は init で Platform を渡し、毎 tick tick を呼ぶ。 + */ +public final class MarumaSign { + // ModのID + public static final String MOD_ID = "marumasa_sign"; + // ロガー + public static final Logger LOGGER = LogManager.getLogger("MarumaSign"); + + private static Platform platform; + private static Config config; + private static ImageLoader loader; + private static SignManager signs; + private static UiRoot ui; + private static SelfTest selfTest; + + // 看板に書き込む予定の文字列 + private static volatile String pendingWrite; + // 読み込みが完了した画像を描画した回数 (動作確認用) + private static volatile int loadedRenderCount; + + private MarumaSign() { + } + + public static synchronized void init(Platform implementation) { + if (platform != null) return; + platform = implementation; + config = new Config(implementation.gameDirectory()); + loader = new ImageLoader(); + signs = new SignManager(implementation, loader); + ui = new UiRoot(implementation); + selfTest = SelfTest.createIfRequested(implementation); + LOGGER.info("Start: " + MOD_ID + " (Minecraft " + implementation.minecraftVersion() + ", " + implementation.loaderName() + ")"); + } + + public static boolean isInitialized() { + return platform != null; + } + + public static Platform platform() { + return platform; + } + + public static Config config() { + return config; + } + + public static SignManager signs() { + return signs; + } + + public static UiRoot ui() { + return ui; + } + + // クライアントの tick ごとに呼ぶ + // 消すのを待っているテクスチャ ({実装, テクスチャ, 残りの tick 数}) + private static final java.util.List pendingReleases = new java.util.ArrayList(); + private static final int RELEASE_DELAY = 20; + + /** + * テクスチャを、少し後で (約 1 秒後に) 消す。 + * 影 Mod (Iris / Oculus) は、直前まで使われていたテクスチャを、描画の状態を元に戻すときにもう一度使うことがある。 + * 使い終わった直後に消すと、存在しないテクスチャを使うことになって OpenGL のエラーが出るので、すぐには消さない。 + */ + public static void releaseTexture(Platform owner, Object texture) { + if (texture == null) return; + synchronized (pendingReleases) { + pendingReleases.add(new Object[] {owner, texture, RELEASE_DELAY}); + } + } + + private static void releasePending() { + final java.util.List due = new java.util.ArrayList(); + synchronized (pendingReleases) { + for (java.util.Iterator it = pendingReleases.iterator(); it.hasNext(); ) { + final Object[] item = it.next(); + final int left = (Integer) item[2] - 1; + item[2] = left; + if (left <= 0) { + due.add(item); + it.remove(); + } + } + } + for (Object[] item : due) { + ((Platform) item[0]).releaseTexture(item[1]); + } + } + + public static void tick() { + if (platform == null) return; + releasePending(); + if (platform.isInWorld()) loader.pump(config.getMaxThreads()); + signs.tick(); + ui.tick(); + if (selfTest != null) selfTest.tick(); + } + + // 画面を開くキーが押されたとき + public static void openMenu() { + if (platform == null || ui.isOpen()) return; + platform.openUi(); + } + + /** + * 看板の文字列に対応する画像を返す。MarumaSign の看板でなければ null。 + */ + public static SignImage sign(String text) { + final SignImage image = signs == null ? null : signs.get(text); + if (selfTest != null) selfTest.onLookup(image != null); + return image; + } + + // 画像を実際に描画したときに呼ぶ (動作確認用の記録) + /** + * アイテムのデータに保存されている看板の文字から、表示する画像を返す。MarumaSign の看板でなければ null。 + * 行ごとのデータは、文字そのままでも、テキストコンポーネント (JSON) でもよい。 + */ + public static SignImage itemSign(String[] rawLines) { + if (signs == null || rawLines == null) return null; + final StringBuilder text = new StringBuilder(); + for (String raw : rawLines) { + text.append(SignText.plain(raw)); + } + return signs.get(text.toString()); + } + + public static void drawn(SignImage image) { + if (!image.isLoaded()) return; + loadedRenderCount++; + if (selfTest != null) selfTest.onDrawn(image); + } + + // スレッドを問わず呼べる、MarumaSign の看板かどうかの判定 + public static boolean isSign(String text) { + return SignSpec.isSign(text); + } + + // ---------- 看板への書き込み ---------- + + // 次に開かれた看板の編集画面に、文字列を自動で書き込むよう予約する + public static void requestWrite(String signText) { + pendingWrite = signText; + chat("text.write_mode"); + } + + // チャットの色。Mod の名前はオレンジ、本文は黄緑で表示する + private static final String CHAT_PREFIX = "§6[MarumaSign] §a"; + + // 選択中の言語でチャットにメッセージを表示する + public static void chat(String key) { + Lang.select(platform.languageCode()); + platform.showMessage(CHAT_PREFIX + Lang.get(key)); + } + + public static boolean hasPendingWrite() { + return pendingWrite != null; + } + + // 予約されている文字列を看板 4 行分に分けて取り出す + public static String[] takePendingWrite() { + final String text = pendingWrite; + pendingWrite = null; + if (text == null) return null; + final String[] lines = SignSpec.splitLines(text, platform.maxSignLineLength()); + if (lines != null) chat("text.write_done"); + return lines; + } + + // 看板に書き込む予定の文字列。なければ null + static String pendingWriteText() { + return pendingWrite; + } + + static int loadedRenderCount() { + return loadedRenderCount; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/Platform.java b/core/src/main/java/marumasa/marumasa_sign/core/Platform.java new file mode 100644 index 00000000..9e02b12d --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/Platform.java @@ -0,0 +1,72 @@ +package marumasa.marumasa_sign.core; + +import java.io.File; + +/** + * Minecraft のバージョンやローダーごとに実装される機能。 + * core はこのインターフェース経由でのみ Minecraft に触れる。 + */ +public interface Platform { + + // 実行中の Minecraft のバージョン (例: "1.12.2") + String minecraftVersion(); + + // ローダーの名前 (例: "forge") + String loaderName(); + + // ゲームディレクトリ (.minecraft) + File gameDirectory(); + + // 選択中の言語コード (例: "ja_jp") + String languageCode(); + + // クライアントのメインスレッドで実行する + void execute(Runnable task); + + // チャット欄にクライアント側だけのメッセージを表示する (§ による色指定を含む) + void showMessage(String message); + + // ワールドに入っているかどうか + boolean isInWorld(); + + // 看板 1 行に書き込める最大文字数 (サーバー側の制限) + int maxSignLineLength(); + + // ARGB のピクセル配列からテクスチャを作る。返り値は実装ごとのハンドル + Object createTexture(int width, int height, int[] argb); + + // 同じ大きさのテクスチャの内容を書き換える + void updateTexture(Object texture, int width, int height, int[] argb); + + // テクスチャを削除する + void releaseTexture(Object texture); + + // MarumaSign の画面を開く / 閉じる + void openUi(); + + void closeUi(); + + // 画面へのファイルのドラッグ&ドロップに対応しているかどうか + boolean supportsFileDrop(); + + String getClipboard(); + + void setClipboard(String text); + + // ---------- 動作確認用 ---------- + + // 視線の上下の向きを変える (度。下向きが正) + void selfTestLook(float pitch); + + // 看板を手に持ち、見ているブロックに使用する + void selfTestUseItem(); + + // タイトル画面が出ていれば、サーバーへの接続を始めて true を返す。まだ始められないか、対応していなければ false。 + // 起動と同時に接続すると入れないバージョンがあるので、そのバージョンの確認では、起動が済んでからここで接続する + default boolean selfTestJoin(String host, int port) { + return false; + } + + // ゲームを終了する + void quit(); +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/SelfTest.java b/core/src/main/java/marumasa/marumasa_sign/core/SelfTest.java new file mode 100644 index 00000000..276c9cfb --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/SelfTest.java @@ -0,0 +1,302 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.sign.SignSpec; +import marumasa.marumasa_sign.core.ui.Key; +import marumasa.marumasa_sign.core.ui.UiRoot; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; + +/** + * 実機での動作確認を自動で行うための仕組み。 + * システムプロパティ marumasign.selftest に結果の出力先フォルダを指定したときだけ動く。 + * ワールドに入ったあと、画面を開いてファイルを選び、看板を設置して表示されるまでを確認する。 + * ファイルを複数指定した場合は、外部のスクリプトにプレイヤーを移動させてもらいながら、順に確認する。 + */ +final class SelfTest { + + private static final int WAIT_WORLD = 0; + private static final int OPEN_UI = 1; + private static final int FILL = 2; + private static final int WAIT_WRITE_MODE = 3; + private static final int USE_ITEM = 4; + private static final int WAIT_RENDER = 5; + private static final int LOOK_AT_SIGN = 6; + private static final int WAIT_MOVE = 7; + private static final int WAIT_ITEM = 8; + private static final int FINISHED = 9; + + private static final String[] STEP_NAMES = { + "WAIT_WORLD", "OPEN_UI", "FILL", "WAIT_WRITE_MODE", "USE_ITEM", "WAIT_RENDER", "LOOK_AT_SIGN", "WAIT_MOVE", + "WAIT_ITEM", "FINISHED" + }; + + // 看板アイテムを受け取ってから、描かれるのを待つ時間の上限 (tick) + private static final int ITEM_TIMEOUT = 20 * 15; + + // 1 つの手順にかけられる時間の上限 (tick) + private static final int STEP_TIMEOUT = 20 * 120; + + private final Platform platform; + private final File directory; + // 看板に表示して確かめるファイル + private final String[] images; + // 確認中のファイルの番号 + private int index; + // 確認中の看板の URL と、それを描画した回数 + private volatile String expectedUrl; + private volatile int drawnCount; + private final StringBuilder summary = new StringBuilder(); + // 看板の文字を持った看板アイテムの見た目も確かめるかどうか + private final boolean checkItem = Boolean.getBoolean("marumasign.selftest.item"); + // 看板アイテムを受け取った時点と、画面の記録を頼んだ時点 (その手順での tick)。まだなら -1 + private int itemGivenAt = -1; + private int itemViewAt = -1; + + // 起動が済んでから自分で接続するサーバー (host:port)。指定がなければ、起動時の指定に任せる + private final String server = System.getProperty("marumasign.selftest.server", ""); + private boolean joining; + private int joinAttempts; + + private int step = WAIT_WORLD; + private int ticksInStep; + private int worldTicks; + private int useAttempts; + private int quitCountdown = -1; + + private SelfTest(Platform platform, File directory, String[] images) { + this.platform = platform; + this.directory = directory; + this.images = images; + } + + static SelfTest createIfRequested(Platform platform) { + final String directory = System.getProperty("marumasign.selftest"); + if (directory == null || directory.isEmpty()) return null; + // 複数のファイルは | で区切って指定する + final String images = System.getProperty("marumasign.selftest.image", ""); + MarumaSign.LOGGER.info("Self test enabled: " + directory); + return new SelfTest(platform, new File(directory), images.split("\\|")); + } + + // 看板を描こうとして内容を調べた回数と、そのうち MarumaSign の看板だった回数。 + // 表示されないときに、看板の描画そのものが呼ばれていないのか、内容を読み取れていないのかを見分ける + private volatile int lookups; + private volatile int recognised; + + void onLookup(boolean found) { + lookups++; + if (found) recognised++; + } + + // 読み込みが完了した看板が描画されたとき + void onDrawn(SignImage image) { + final String url = expectedUrl; + if (url != null && url.equals(image.spec.url)) drawnCount++; + } + + private void next(int nextStep) { + step = nextStep; + ticksInStep = 0; + } + + void tick() { + if (quitCountdown >= 0) { + if (quitCountdown-- == 0) platform.quit(); + return; + } + if (step == FINISHED) return; + // ワールドに入るまでは、影 Mod のシェーダーの準備などで時間がかかることがあるので、長めに待つ + if (++ticksInStep > (step == WAIT_WORLD ? STEP_TIMEOUT * 3 : STEP_TIMEOUT)) { + finish(false, "Timed out at step " + STEP_NAMES[step] + + (step == WAIT_RENDER ? " (signs looked up " + lookups + " times, recognised " + recognised + " times)" : "")); + return; + } + try { + run(); + } catch (RuntimeException e) { + MarumaSign.LOGGER.error("Self test failed", e); + finish(false, "Exception at step " + STEP_NAMES[step] + ": " + e); + } + } + + private void run() { + final UiRoot ui = MarumaSign.ui(); + switch (step) { + case WAIT_WORLD: + // ワールドに入ってから、サーバー側の準備 (アイテムの付与など) が済むまで待つ + if (!server.isEmpty() && !platform.isInWorld()) { + // 初期の Forge には、接続が途中で止まることがある不具合がある。入れないまま時間が経ったら、やり直す + if (joining && ticksInStep > 20 * 40) joining = false; + if (!joining && ticksInStep > 60 && joinAttempts < 6) { + final int colon = server.lastIndexOf(':'); + joining = platform.selfTestJoin(server.substring(0, colon), Integer.parseInt(server.substring(colon + 1))); + if (joining) { + joinAttempts++; + // 接続を始めた時点から、待ち時間を数え直す + ticksInStep = 0; + } + } + } + worldTicks = platform.isInWorld() ? worldTicks + 1 : 0; + if (worldTicks > 20 * 8) { + worldTicks = 0; + next(OPEN_UI); + } + break; + + case OPEN_UI: + if (ticksInStep == 1) MarumaSign.openMenu(); + if (ui.isOpen() && ticksInStep > 10) next(FILL); + break; + + case FILL: + if (ticksInStep == 1) { + // キー入力の経路も通すため、1 文字入力してから消す + ui.charTyped('x'); + ui.keyPressed(Key.BACKSPACE, 0); + ui.mainPage().setSource(images[index]); + ui.mainPage().setParameters(1f, 1f, 0f, 1f, 0f, 0f, 0f, 0f); + } + if (ticksInStep == 20) { + ui.mainPage().place(); + next(WAIT_WRITE_MODE); + } + break; + + case WAIT_WRITE_MODE: + if (MarumaSign.hasPendingWrite()) { + final SignSpec spec = SignSpec.parse(MarumaSign.pendingWriteText()); + drawnCount = 0; + expectedUrl = spec == null ? null : spec.url; + useAttempts = 0; + next(USE_ITEM); + } else if (!ui.mainPage().isBusy() && ticksInStep > 5) { + finish(false, "Could not prepare the sign: " + ui.mainPage().statusText()); + } + break; + + case USE_ITEM: + if (!MarumaSign.hasPendingWrite()) { + next(WAIT_RENDER); + } else if (ticksInStep % 40 == 20) { + if (++useAttempts > 20) { + finish(false, "The sign edit screen did not open"); + return; + } + // 少し先の地面を見て看板を置く + platform.selfTestLook(50f); + platform.selfTestUseItem(); + } + break; + + case WAIT_RENDER: + // 画像の全体が見えるように正面を向く。 + // サーバーからの位置の補正で向きが戻されることがあるので、毎 tick 向き直す + platform.selfTestLook(0f); + if (drawnCount > 0 && ticksInStep > 40) next(LOOK_AT_SIGN); + break; + + case LOOK_AT_SIGN: + // 外部のスクリプトが画面を記録できるように、合図のファイルを書きながら進める。 + // まず、画像の全体が写っている状態 + if (ticksInStep < 60) platform.selfTestLook(0f); + if (ticksInStep == 20) writeFile("view-" + index + ".txt", "ready\n"); + // 次に、看板そのものが消えていることを確認できるように、看板の位置を見下ろす + if (ticksInStep >= 60 && ticksInStep < 140) platform.selfTestLook(50f); + if (ticksInStep == 90) writeFile("sign-view-" + index + ".txt", "ready\n"); + if (ticksInStep >= 140) platform.selfTestLook(0f); + if (ticksInStep == 150) { + if (summary.length() > 0) summary.append(", "); + summary.append(new File(images[index]).getName()).append(" rendered ").append(drawnCount).append(" times"); + if (index + 1 < images.length) { + // 次のファイルは、前の看板が見えない場所で確認する + writeFile("move-" + index + ".txt", "ready\n"); + next(WAIT_MOVE); + } else if (checkItem) { + // 外部のスクリプトに、看板の文字を持った看板アイテムを渡してもらう + expectedUrl = null; + writeFile("item-request.txt", "ready\n"); + next(WAIT_ITEM); + } else { + finish(true, summary.toString()); + } + } + break; + + case WAIT_MOVE: + // 外部のスクリプトがプレイヤーを移動させるのを待つ + if (new File(directory, "moved-" + index + ".txt").isFile()) { + if (worldTicks == 0) worldTicks = ticksInStep; + // 移動先の地形が届くまで少し待つ + if (ticksInStep - worldTicks > 80) { + worldTicks = 0; + expectedUrl = null; + index++; + next(OPEN_UI); + } + } + break; + + case WAIT_ITEM: + if (itemGivenAt < 0) { + // 渡したアイテムの URL が書かれたファイルを待つ + final String url = readFile("item-given.txt"); + if (url != null) { + drawnCount = 0; + expectedUrl = url.trim(); + itemGivenAt = ticksInStep; + } + } else if (itemViewAt < 0) { + // アイテムは手持ちの枠 (ホットバー) に入るので、画面の下に描かれる + if (drawnCount > 0 && ticksInStep - itemGivenAt > 40) { + writeFile("item-view.txt", "ready\n"); + itemViewAt = ticksInStep; + } else if (ticksInStep - itemGivenAt > ITEM_TIMEOUT) { + finish(true, summary + ", item not rendered"); + } + } else if (ticksInStep - itemViewAt > 60) { + finish(true, summary + ", item rendered " + drawnCount + " times"); + } + break; + + default: + break; + } + } + + // 外部のスクリプトが書いたファイルを読む。まだなければ null + private String readFile(String name) { + final File file = new File(directory, name); + if (!file.isFile()) return null; + try { + return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); + } catch (IOException e) { + return null; + } + } + + // 外部の確認用スクリプトに進み具合を知らせるファイルを書く + private void writeFile(String name, String content) { + try { + if (!directory.isDirectory() && !directory.mkdirs()) throw new IOException("Cannot create " + directory); + Files.write(new File(directory, name).toPath(), content.getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + MarumaSign.LOGGER.error("Failed to write " + name, e); + } + } + + private void finish(boolean ok, String detail) { + step = FINISHED; + final String result = (ok ? "OK" : "FAIL") + "\n" + detail + "\n" + + "minecraft=" + platform.minecraftVersion() + "\n" + + "loader=" + platform.loaderName() + "\n"; + MarumaSign.LOGGER.info("Self test result: " + (ok ? "OK" : "FAIL") + " - " + detail); + writeFile("result.txt", result); + // 結果を書いてから、外部で画面を記録できるように少し待って終了する + quitCountdown = 100; + } +} diff --git a/src/main/java/marumasa/marumasa_sign/animation/AnimationCanvas.java b/core/src/main/java/marumasa/marumasa_sign/core/anim/AnimationCanvas.java similarity index 98% rename from src/main/java/marumasa/marumasa_sign/animation/AnimationCanvas.java rename to core/src/main/java/marumasa/marumasa_sign/core/anim/AnimationCanvas.java index 8ec08aab..cae49cd8 100644 --- a/src/main/java/marumasa/marumasa_sign/animation/AnimationCanvas.java +++ b/core/src/main/java/marumasa/marumasa_sign/core/anim/AnimationCanvas.java @@ -1,4 +1,4 @@ -package marumasa.marumasa_sign.animation; +package marumasa.marumasa_sign.core.anim; public class AnimationCanvas { private final int width; diff --git a/src/main/java/marumasa/marumasa_sign/animation/AnimationFrame.java b/core/src/main/java/marumasa/marumasa_sign/core/anim/AnimationFrame.java similarity index 90% rename from src/main/java/marumasa/marumasa_sign/animation/AnimationFrame.java rename to core/src/main/java/marumasa/marumasa_sign/core/anim/AnimationFrame.java index c5cf0bd4..fa19a57e 100644 --- a/src/main/java/marumasa/marumasa_sign/animation/AnimationFrame.java +++ b/core/src/main/java/marumasa/marumasa_sign/core/anim/AnimationFrame.java @@ -1,4 +1,4 @@ -package marumasa.marumasa_sign.animation; +package marumasa.marumasa_sign.core.anim; public class AnimationFrame { private final int[] pixels; // ARGB format pixels diff --git a/src/main/java/marumasa/marumasa_sign/animation/ApngDecoder.java b/core/src/main/java/marumasa/marumasa_sign/core/anim/ApngDecoder.java similarity index 99% rename from src/main/java/marumasa/marumasa_sign/animation/ApngDecoder.java rename to core/src/main/java/marumasa/marumasa_sign/core/anim/ApngDecoder.java index 31c3d337..8da70b7f 100644 --- a/src/main/java/marumasa/marumasa_sign/animation/ApngDecoder.java +++ b/core/src/main/java/marumasa/marumasa_sign/core/anim/ApngDecoder.java @@ -1,4 +1,4 @@ -package marumasa.marumasa_sign.animation; +package marumasa.marumasa_sign.core.anim; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/marumasa/marumasa_sign/animation/DecodedAnimation.java b/core/src/main/java/marumasa/marumasa_sign/core/anim/DecodedAnimation.java similarity index 94% rename from src/main/java/marumasa/marumasa_sign/animation/DecodedAnimation.java rename to core/src/main/java/marumasa/marumasa_sign/core/anim/DecodedAnimation.java index ae4bc7e3..d0dddbfd 100644 --- a/src/main/java/marumasa/marumasa_sign/animation/DecodedAnimation.java +++ b/core/src/main/java/marumasa/marumasa_sign/core/anim/DecodedAnimation.java @@ -1,4 +1,4 @@ -package marumasa.marumasa_sign.animation; +package marumasa.marumasa_sign.core.anim; import java.util.List; diff --git a/src/main/java/marumasa/marumasa_sign/animation/GifDecoder.java b/core/src/main/java/marumasa/marumasa_sign/core/anim/GifDecoder.java similarity index 99% rename from src/main/java/marumasa/marumasa_sign/animation/GifDecoder.java rename to core/src/main/java/marumasa/marumasa_sign/core/anim/GifDecoder.java index 7d918656..a54888d1 100644 --- a/src/main/java/marumasa/marumasa_sign/animation/GifDecoder.java +++ b/core/src/main/java/marumasa/marumasa_sign/core/anim/GifDecoder.java @@ -1,4 +1,4 @@ -package marumasa.marumasa_sign.animation; +package marumasa.marumasa_sign.core.anim; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfBaker.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfBaker.java new file mode 100644 index 00000000..96b48edd --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfBaker.java @@ -0,0 +1,491 @@ +package marumasa.marumasa_sign.core.gltf; + +import java.util.ArrayList; +import java.util.List; + +/** + * 材質の細かい表現 (法線マップ、金属らしさと粗さのテクスチャ、発光のテクスチャなど) を、 + * 陰影を計算した 1 枚のテクスチャに焼き込む。 + * 描画はどのバージョンでも「テクスチャ 1 枚と頂点の色」だけで行うため、 + * ピクセル単位の計算が必要な表現は、読み込みの時点でテクスチャの各点について済ませておく。 + * + * 左右対称のモデルなどでは、向きの違う面がテクスチャの同じ場所を使っている。 + * 陰影は面の向きで変わるので、そのような面は別の層に分け、層を横に並べたテクスチャにする。 + */ +final class GltfBaker { + + // 画像と、その中の色の取り出し + static final class Map { + final int width, height; + final int[] argb; + // 使うテクスチャ座標。0 は焼き込み先と同じ座標、1 以上は Surface.extraUv の (番号 - 1) 番目 + final int slot; + // 範囲の外の扱い。0: 端で止める、1: 繰り返す、2: 折り返しながら繰り返す + final int wrapU, wrapV; + + Map(int width, int height, int[] argb, int slot, int wrapU, int wrapV) { + this.width = width; + this.height = height; + this.argb = argb; + this.slot = slot; + this.wrapU = wrapU; + this.wrapV = wrapV; + } + + // u, v の位置の色。周りの 4 点から、なめらかにつながるように求める + int at(float u, float v) { + final float x = position(u, width, wrapU), y = position(v, height, wrapV); + final int x0 = (int) Math.floor(x), y0 = (int) Math.floor(y); + final float tx = x - x0, ty = y - y0; + final int left = index(x0, width, wrapU), right = index(x0 + 1, width, wrapU); + final int top = index(y0, height, wrapV) * width, bottom = index(y0 + 1, height, wrapV) * width; + final int a = argb[top + left], b = argb[top + right], c = argb[bottom + left], d = argb[bottom + right]; + if (a == b && a == c && a == d) return a; + int result = 0; + for (int shift = 0; shift < 32; shift += 8) { + final float upper = ((a >>> shift) & 0xFF) + (((b >>> shift) & 0xFF) - ((a >>> shift) & 0xFF)) * tx; + final float lower = ((c >>> shift) & 0xFF) + (((d >>> shift) & 0xFF) - ((c >>> shift) & 0xFF)) * tx; + result |= ((int) (upper + (lower - upper) * ty + 0.5f) & 0xFF) << shift; + } + return result; + } + + // 座標を、点の中心を整数とする画像上の位置にする + private static float position(float coordinate, int size, int wrap) { + if (wrap != 0) { + final float period = wrap == 2 ? 2f : 1f; + coordinate -= (float) Math.floor(coordinate / period) * period; + if (coordinate > 1f) coordinate = 2f - coordinate; + } + return coordinate * size - 0.5f; + } + + private static int index(int position, int size, int wrap) { + if (wrap == 1) return position < 0 ? position + size : position >= size ? position - size : position; + return position < 0 ? 0 : position >= size ? size - 1 : position; + } + } + + // 焼き込む材質 + static final class Input { + Map base, metallicRoughness, normal, occlusion, emissive; + // リニアの値 + float[] baseFactor = {1, 1, 1, 1}; + float[] emissiveFactor = {0, 0, 0}; + float metallic = 1, roughness = 1; + float normalScale = 1, occlusionStrength = 1; + int alphaMode; + float alphaCutoff = 0.5f; + } + + // 焼き込む面。行列はモデルの座標への変換 (列優先の 4x4) + static final class Surface { + final GltfModel.Primitive primitive; + final float[] matrix; + // 焼き込み先とは別のテクスチャ座標 (三角形の角ごと)。使わなければ null + final float[][] extraUv; + // モデルの座標に変換した頂点 + float[] positions, normals, tangents; + float sign; + // 三角形ごとの、割り当てた層 + int[] layers; + + Surface(GltfModel.Primitive primitive, float[] matrix, float[][] extraUv) { + this.primitive = primitive; + this.matrix = matrix; + this.extraUv = extraUv; + } + } + + static final class Result { + // 層を横に並べたテクスチャ (ARGB)。幅は width * layers + int[] pixels; + int layers; + } + + // 層の数の上限 + private static final int MAX_LAYERS = 4; + // 三角形の中で、すでに別の向きの面が使っている点がこの割合を超えたら、次の層に回す + private static final float MAX_OVERLAP = 0.1f; + // テクスチャ上で面積のない三角形がこの割合を超えたら、焼き込みをやめる + private static final float MAX_FLAT = 0.02f; + // 面の継ぎ目に色がにじまないように、面の外側へ色を広げる回数 + private static final int DILATION = 6; + + // 1 つの層 + private static final class Layer { + final int[] pixels; + // 各点を最初に塗った面の法線。重なりの検出に使う + final int[] owner; + final boolean[] covered; + + Layer(int size) { + pixels = new int[size]; + owner = new int[size]; + covered = new boolean[size]; + } + } + + private final Input input; + private final int width, height; + private final List layers = new ArrayList(); + private final float[] shaded = new float[3]; + // scan の結果 + private int inside, overlap; + + private GltfBaker(Input input, int width, int height) { + this.input = input; + this.width = width; + this.height = height; + } + + /** + * 焼き込んだテクスチャを返す。面のテクスチャ座標は変更しない。 + * どの層の画像を使うかは Surface.layers に入るので、成功したら apply で座標に反映する。 + * + * @return 重なりが多すぎて焼き込めない場合は null + */ + static Result bake(Input input, List surfaces, int width, int height) { + final GltfBaker baker = new GltfBaker(input, width, height); + for (Surface surface : surfaces) { + baker.prepare(surface); + if (!baker.paint(surface)) return null; + } + if (baker.layers.isEmpty()) return null; + + final int count = baker.layers.size(); + final Result result = new Result(); + result.layers = count; + result.pixels = new int[width * count * height]; + for (int i = 0; i < count; i++) { + final Layer layer = baker.layers.get(i); + dilate(layer.pixels, layer.covered, width, height); + for (int y = 0; y < height; y++) { + System.arraycopy(layer.pixels, y * width, result.pixels, y * width * count + i * width, width); + } + } + return result; + } + + // 面のテクスチャ座標を、層を横に並べたテクスチャのものに直す + static void apply(List surfaces, int layerCount) { + for (Surface surface : surfaces) { + final float[] uv = surface.primitive.cornerUv; + for (int triangle = 0; triangle < surface.layers.length; triangle++) { + for (int corner = 0; corner < 3; corner++) { + final int index = (triangle * 3 + corner) * 2; + uv[index] = (uv[index] + surface.layers[triangle]) / layerCount; + } + } + } + } + + // 頂点をモデルの座標に変換する + private void prepare(Surface surface) { + final GltfModel.Primitive primitive = surface.primitive; + final float[] m = surface.matrix; + final float[] normalMatrix = new float[9]; + Mat4.normalMatrix(m, normalMatrix); + final float sign = Mat4.determinant3(m) < 0 ? -1 : 1; + final int count = primitive.vertexCount; + + surface.sign = sign; + surface.positions = new float[count * 3]; + surface.normals = primitive.normals == null ? null : new float[count * 3]; + surface.tangents = primitive.tangents == null || surface.normals == null ? null : new float[count * 3]; + surface.layers = new int[primitive.indices.length / 3]; + for (int i = 0; i < count; i++) { + final float px = primitive.positions[i * 3], py = primitive.positions[i * 3 + 1], pz = primitive.positions[i * 3 + 2]; + surface.positions[i * 3] = m[0] * px + m[4] * py + m[8] * pz + m[12]; + surface.positions[i * 3 + 1] = m[1] * px + m[5] * py + m[9] * pz + m[13]; + surface.positions[i * 3 + 2] = m[2] * px + m[6] * py + m[10] * pz + m[14]; + if (surface.normals != null) { + final float nx = primitive.normals[i * 3], ny = primitive.normals[i * 3 + 1], nz = primitive.normals[i * 3 + 2]; + surface.normals[i * 3] = (normalMatrix[0] * nx + normalMatrix[3] * ny + normalMatrix[6] * nz) * sign; + surface.normals[i * 3 + 1] = (normalMatrix[1] * nx + normalMatrix[4] * ny + normalMatrix[7] * nz) * sign; + surface.normals[i * 3 + 2] = (normalMatrix[2] * nx + normalMatrix[5] * ny + normalMatrix[8] * nz) * sign; + normalize(surface.normals, i * 3); + } + if (surface.tangents != null) { + final float tx = primitive.tangents[i * 4], ty = primitive.tangents[i * 4 + 1], tz = primitive.tangents[i * 4 + 2]; + surface.tangents[i * 3] = m[0] * tx + m[4] * ty + m[8] * tz; + surface.tangents[i * 3 + 1] = m[1] * tx + m[5] * ty + m[9] * tz; + surface.tangents[i * 3 + 2] = m[2] * tx + m[6] * ty + m[10] * tz; + } + } + } + + // 面の三角形を、重ならない層を選んで塗る。層が足りないか、テクスチャに焼き込めない面が多ければ false + private boolean paint(Surface surface) { + final int triangles = surface.layers.length; + final float[] uv = surface.primitive.cornerUv; + int flat = 0; + for (int triangle = 0; triangle < triangles; triangle++) { + // テクスチャ上で面積のない三角形 (1 点や線に潰れている) は、塗る場所がない + final int o = triangle * 6; + final float area = (uv[o + 2] - uv[o]) * width * (uv[o + 5] - uv[o + 1]) * height + - (uv[o + 4] - uv[o]) * width * (uv[o + 3] - uv[o + 1]) * height; + if (!(Math.abs(area) > 1e-6f)) { + if (++flat > triangles * MAX_FLAT) return false; + continue; + } + + int chosen = -1; + for (int index = 0; index < MAX_LAYERS; index++) { + if (index == layers.size()) { + // まだ使っていない層なら、必ず空いている + chosen = index; + break; + } + raster(surface, triangle, layers.get(index), false); + if (overlap <= inside * MAX_OVERLAP) { + chosen = index; + break; + } + } + if (chosen < 0) return false; + if (chosen == layers.size()) layers.add(new Layer(width * height)); + surface.layers[triangle] = chosen; + raster(surface, triangle, layers.get(chosen), true); + } + return true; + } + + /** + * 三角形 1 枚を、テクスチャの上でたどる。 + * paint が false なら、三角形の中の点の数 (inside) と、別の向きの面がすでに使っている点の数 (overlap) を数えるだけにする。 + */ + private void raster(Surface surface, int triangle, Layer layer, boolean paint) { + inside = 0; + overlap = 0; + final GltfModel.Primitive primitive = surface.primitive; + final float[] positions = surface.positions; + final float[] normals = surface.normals; + final float[] tangents = surface.tangents; + final float sign = surface.sign; + final int t = triangle * 3; + final int a = primitive.indices[t], b = primitive.indices[t + 1], c = primitive.indices[t + 2]; + final float[] uv = primitive.cornerUv; + final float ua = uv[t * 2], va = uv[t * 2 + 1]; + final float ub = uv[t * 2 + 2], vb = uv[t * 2 + 3]; + final float uc = uv[t * 2 + 4], vc = uv[t * 2 + 5]; + + // テクスチャ上での位置 (ピクセル) + final float xa = ua * width, ya = va * height; + final float xb = ub * width, yb = vb * height; + final float xc = uc * width, yc = vc * height; + final float area = (xb - xa) * (yc - ya) - (xc - xa) * (yb - ya); + if (area == 0 || Float.isNaN(area)) return; + + // 面の向き + final float e1x = positions[b * 3] - positions[a * 3], e1y = positions[b * 3 + 1] - positions[a * 3 + 1], + e1z = positions[b * 3 + 2] - positions[a * 3 + 2]; + final float e2x = positions[c * 3] - positions[a * 3], e2y = positions[c * 3 + 1] - positions[a * 3 + 1], + e2z = positions[c * 3 + 2] - positions[a * 3 + 2]; + float fx = (e1y * e2z - e1z * e2y) * sign, fy = (e1z * e2x - e1x * e2z) * sign, fz = (e1x * e2y - e1y * e2x) * sign; + final float faceLength = (float) Math.sqrt(fx * fx + fy * fy + fz * fz); + if (faceLength == 0) return; + fx /= faceLength; + fy /= faceLength; + fz /= faceLength; + + // テクスチャの横方向 (u が増える向き) を表す、面に沿ったベクトル。法線マップの貼り方で決まる + final float[] bumpUv = input.normal != null && input.normal.slot > 0 && surface.extraUv != null + ? surface.extraUv[input.normal.slot - 1] : uv; + final float du1 = bumpUv[t * 2 + 2] - bumpUv[t * 2], dv1 = bumpUv[t * 2 + 3] - bumpUv[t * 2 + 1]; + final float du2 = bumpUv[t * 2 + 4] - bumpUv[t * 2], dv2 = bumpUv[t * 2 + 5] - bumpUv[t * 2 + 1]; + final float uvArea = du1 * dv2 - du2 * dv1; + float faceTx = 0, faceTy = 0, faceTz = 0; + if (uvArea != 0) { + faceTx = (e1x * dv2 - e2x * dv1) / uvArea; + faceTy = (e1y * dv2 - e2y * dv1) / uvArea; + faceTz = (e1z * dv2 - e2z * dv1) / uvArea; + } + // テクスチャの縦は下向きに増えるので、普通の貼り方では面積が負になる。そのとき画像の上が面の「上」になる + final float faceHand = uvArea < 0 ? 1 : -1; + + final int minX = Math.max(0, (int) Math.floor(Math.min(xa, Math.min(xb, xc)) - 0.5f)); + final int maxX = Math.min(width - 1, (int) Math.ceil(Math.max(xa, Math.max(xb, xc)) - 0.5f)); + final int minY = Math.max(0, (int) Math.floor(Math.min(ya, Math.min(yb, yc)) - 0.5f)); + final int maxY = Math.min(height - 1, (int) Math.ceil(Math.max(ya, Math.max(yb, yc)) - 0.5f)); + // 辺の上の点を取りこぼさないための余裕 + final float tolerance = 0.5f / Math.max(1f, Math.abs(area)) * (Math.abs(xb - xa) + Math.abs(xc - xa) + + Math.abs(yb - ya) + Math.abs(yc - ya)); + + for (int y = minY; y <= maxY; y++) { + for (int x = minX; x <= maxX; x++) { + final float px = x + 0.5f, py = y + 0.5f; + final float w0 = ((xb - px) * (yc - py) - (xc - px) * (yb - py)) / area; + final float w1 = ((xc - px) * (ya - py) - (xa - px) * (yc - py)) / area; + final float w2 = 1 - w0 - w1; + if (w0 < -tolerance || w1 < -tolerance || w2 < -tolerance) continue; + final boolean within = w0 >= 0 && w1 >= 0 && w2 >= 0; + final int pixel = y * width + x; + // 面の外側にはみ出した点は、まだ塗られていないときだけ塗る + if (!within && (!paint || layer.covered[pixel])) continue; + + // 法線 + float nx = fx, ny = fy, nz = fz; + if (normals != null) { + final float ix = normals[a * 3] * w0 + normals[b * 3] * w1 + normals[c * 3] * w2; + final float iy = normals[a * 3 + 1] * w0 + normals[b * 3 + 1] * w1 + normals[c * 3 + 1] * w2; + final float iz = normals[a * 3 + 2] * w0 + normals[b * 3 + 2] * w1 + normals[c * 3 + 2] * w2; + final float length = (float) Math.sqrt(ix * ix + iy * iy + iz * iz); + if (length > 0) { + nx = ix / length; + ny = iy / length; + nz = iz / length; + } + } + + if (within) { + inside++; + if (layer.covered[pixel]) { + final int packed = layer.owner[pixel]; + final float ox = ((packed >> 20) & 0x3FF) / 511f - 1, oy = ((packed >> 10) & 0x3FF) / 511f - 1, + oz = (packed & 0x3FF) / 511f - 1; + // 別の向きの面がすでに同じ点を使っている + if (ox * nx + oy * ny + oz * nz < 0.7f) overlap++; + } else if (paint) { + layer.covered[pixel] = true; + layer.owner[pixel] = (Math.round((nx + 1) * 511f) << 20) | (Math.round((ny + 1) * 511f) << 10) + | Math.round((nz + 1) * 511f); + } + } + if (!paint) continue; + + final float u = px / width, v = py / height; + if (input.normal != null) { + // 接線。頂点に指定があればそれを、なければ面から求めたものを使う + float tx, ty, tz, hand; + if (tangents != null) { + tx = tangents[a * 3] * w0 + tangents[b * 3] * w1 + tangents[c * 3] * w2; + ty = tangents[a * 3 + 1] * w0 + tangents[b * 3 + 1] * w1 + tangents[c * 3 + 1] * w2; + tz = tangents[a * 3 + 2] * w0 + tangents[b * 3 + 2] * w1 + tangents[c * 3 + 2] * w2; + hand = primitive.tangents[a * 4 + 3] < 0 ? -sign : sign; + } else { + tx = faceTx; + ty = faceTy; + tz = faceTz; + hand = faceHand; + } + // 法線に直交させる + final float along = tx * nx + ty * ny + tz * nz; + tx -= nx * along; + ty -= ny * along; + tz -= nz * along; + final float length = (float) Math.sqrt(tx * tx + ty * ty + tz * tz); + if (length > 1e-12f) { + tx /= length; + ty /= length; + tz /= length; + final float bx = (ny * tz - nz * ty) * hand, by = (nz * tx - nx * tz) * hand, bz = (nx * ty - ny * tx) * hand; + final int sample = sample(input.normal, surface, t, u, v, w0, w1, w2); + final float mx = (((sample >> 16) & 0xFF) / 127.5f - 1) * input.normalScale; + final float my = (((sample >> 8) & 0xFF) / 127.5f - 1) * input.normalScale; + final float mz = (sample & 0xFF) / 127.5f - 1; + final float rx = tx * mx + bx * my + nx * mz; + final float ry = ty * mx + by * my + ny * mz; + final float rz = tz * mx + bz * my + nz * mz; + final float bent = (float) Math.sqrt(rx * rx + ry * ry + rz * rz); + if (bent > 0) { + nx = rx / bent; + ny = ry / bent; + nz = rz / bent; + } + } + } + layer.pixels[pixel] = texel(surface, t, u, v, w0, w1, w2, nx, ny, nz); + } + } + } + + // 画像の色を取り出す。焼き込み先と違う座標を使う画像は、三角形の中での位置から座標を求める + private static int sample(Map map, Surface surface, int corner, float u, float v, float w0, float w1, float w2) { + if (map.slot == 0 || surface.extraUv == null) return map.at(u, v); + final float[] uv = surface.extraUv[map.slot - 1]; + final int o = corner * 2; + return map.at(uv[o] * w0 + uv[o + 2] * w1 + uv[o + 4] * w2, uv[o + 1] * w0 + uv[o + 3] * w1 + uv[o + 5] * w2); + } + + // テクスチャの 1 点の色を計算する + private int texel(Surface surface, int corner, float u, float v, float w0, float w1, float w2, + float nx, float ny, float nz) { + float r = input.baseFactor[0], g = input.baseFactor[1], b = input.baseFactor[2], a = input.baseFactor[3]; + if (input.base != null) { + final int sample = sample(input.base, surface, corner, u, v, w0, w1, w2); + r *= GltfLight.toLinear(sample >> 16); + g *= GltfLight.toLinear(sample >> 8); + b *= GltfLight.toLinear(sample); + a *= (sample >>> 24) / 255f; + } + + float metallic = input.metallic, roughness = input.roughness; + if (input.metallicRoughness != null) { + final int sample = sample(input.metallicRoughness, surface, corner, u, v, w0, w1, w2); + roughness *= ((sample >> 8) & 0xFF) / 255f; + metallic *= (sample & 0xFF) / 255f; + } + float occlusion = 1; + if (input.occlusion != null) { + final int sample = sample(input.occlusion, surface, corner, u, v, w0, w1, w2); + occlusion = 1 + input.occlusionStrength * (((sample >> 16) & 0xFF) / 255f - 1); + } + GltfLight.shade(r, g, b, metallic, roughness, nx, ny, nz, occlusion, shaded); + r = shaded[0]; + g = shaded[1]; + b = shaded[2]; + + if (input.emissive != null) { + final int sample = sample(input.emissive, surface, corner, u, v, w0, w1, w2); + r += GltfLight.toLinear(sample >> 16) * input.emissiveFactor[0]; + g += GltfLight.toLinear(sample >> 8) * input.emissiveFactor[1]; + b += GltfLight.toLinear(sample) * input.emissiveFactor[2]; + } else { + r += input.emissiveFactor[0]; + g += input.emissiveFactor[1]; + b += input.emissiveFactor[2]; + } + + if (input.alphaMode == GltfModel.ALPHA_OPAQUE) a = 1; + else if (input.alphaMode == GltfModel.ALPHA_MASK) a = a >= input.alphaCutoff ? 1 : 0; + final int alpha = Math.max(0, Math.min(255, Math.round(a * 255f))); + return (alpha << 24) | (GltfLight.toDisplay(r) << 16) | (GltfLight.toDisplay(g) << 8) | GltfLight.toDisplay(b); + } + + private static void normalize(float[] array, int offset) { + final float length = (float) Math.sqrt(array[offset] * array[offset] + array[offset + 1] * array[offset + 1] + + array[offset + 2] * array[offset + 2]); + if (length > 0) { + array[offset] /= length; + array[offset + 1] /= length; + array[offset + 2] /= length; + } + } + + // 塗られていない点に、隣の塗られた点の色を広げる + private static void dilate(int[] pixels, boolean[] covered, int width, int height) { + boolean[] current = covered; + for (int pass = 0; pass < DILATION; pass++) { + final boolean[] next = current.clone(); + boolean changed = false; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + final int pixel = y * width + x; + if (current[pixel]) continue; + int source = -1; + if (x > 0 && current[pixel - 1]) source = pixel - 1; + else if (x < width - 1 && current[pixel + 1]) source = pixel + 1; + else if (y > 0 && current[pixel - width]) source = pixel - width; + else if (y < height - 1 && current[pixel + width]) source = pixel + width; + if (source < 0) continue; + pixels[pixel] = pixels[source]; + next[pixel] = true; + changed = true; + } + } + current = next; + if (!changed) break; + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfLight.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfLight.java new file mode 100644 index 00000000..9b9a974e --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfLight.java @@ -0,0 +1,126 @@ +package marumasa.marumasa_sign.core.gltf; + +/** + * 3D モデルの陰影の計算。金属らしさと粗さを使う glTF の材質の式を、決まった照明で計算する。 + * 照明はモデルに固定で、上からの空の明るさ、斜め上からの太陽、空と地面の映り込みからなる。 + * 白い面の明るさが Minecraft のブロックに近くなる (上面が最も明るく、側面、底面の順に暗い) ように調整してある。 + * 色の計算はすべて、光の強さに比例する値 (リニア) で行う。 + */ +final class GltfLight { + + // 空と地面の明るさ + private static final float SKY = 0.39f; + private static final float GROUND = 0.21f; + // 太陽の向きと明るさ + private static final float SUN_X = 0.088f, SUN_Y = 0.894f, SUN_Z = 0.440f; + private static final float SUN = 0.68f; + // ハイライトに使う太陽の明るさ。実際の太陽は空よりずっと明るいので、強めにする + private static final float SUN_GLARE = 2.4f; + // 映り込む景色の明るさ + private static final float MIRROR_SKY = 1.0f; + private static final float MIRROR_GROUND = 0.16f; + // 見る人の向き (モデルの正面の少し上から見る) + private static final float VIEW_X = 0f, VIEW_Y = 0.196f, VIEW_Z = 0.981f; + + private static final float[] TO_LINEAR = new float[256]; + private static final byte[] TO_DISPLAY = new byte[4097]; + + static { + for (int i = 0; i < 256; i++) { + TO_LINEAR[i] = (float) Math.pow(i / 255.0, 2.2); + } + for (int i = 0; i <= 4096; i++) { + TO_DISPLAY[i] = (byte) Math.round(Math.pow(i / 4096.0, 1 / 2.2) * 255.0); + } + } + + private GltfLight() { + } + + // 画像の色の値 (0 - 255) を、光の強さに比例する値にする + static float toLinear(int value) { + return TO_LINEAR[value & 0xFF]; + } + + static float toLinear(float display) { + if (display <= 0) return 0; + return (float) Math.pow(Math.min(display, 1f), 2.2); + } + + // 光の強さに比例する値を、画像の色の値 (0 - 255) にする + static int toDisplay(float linear) { + if (!(linear > 0)) return 0; + if (linear >= 1) return 255; + return TO_DISPLAY[(int) (linear * 4096f + 0.5f)] & 0xFF; + } + + /** + * 面の色を計算する。発光は含まない。 + * + * @param r 面の色 (リニア)。結果は out[0..2] に入る + * @param metallic 金属らしさ (0 - 1) + * @param roughness 粗さ (0 - 1) + * @param nx 面の外側を向いた、長さ 1 の法線 (モデルの座標) + * @param occlusion 周りの形で光が遮られる度合い (1 で遮られない) + */ + static void shade(float r, float g, float b, float metallic, float roughness, + float nx, float ny, float nz, float occlusion, float[] out) { + metallic = metallic < 0 ? 0 : metallic > 1 ? 1 : metallic; + roughness = roughness < 0.04f ? 0.04f : roughness > 1 ? 1 : roughness; + + // 見る人のほうを向いていない面は、裏から見ているものとして扱う + float nv = nx * VIEW_X + ny * VIEW_Y + nz * VIEW_Z; + final float facing = nv < 0 ? -nv : nv; + final float nl = Math.max(0f, nx * SUN_X + ny * SUN_Y + nz * SUN_Z); + + // 空と地面からの光と、太陽の光 + final float ambient = (GROUND + (SKY - GROUND) * (0.5f + 0.5f * ny)) * occlusion; + final float diffuse = (ambient + SUN * nl) * (1 - metallic); + + // 正面から見たときの反射率。金属は面の色、それ以外は 4% + final float f0r = 0.04f + (r - 0.04f) * metallic; + final float f0g = 0.04f + (g - 0.04f) * metallic; + final float f0b = 0.04f + (b - 0.04f) * metallic; + + // 太陽のハイライト (GGX) + float glare = 0; + float fresnelSun = 0; + if (nl > 0 && nv > 0) { + float hx = SUN_X + VIEW_X, hy = SUN_Y + VIEW_Y, hz = SUN_Z + VIEW_Z; + final float length = (float) Math.sqrt(hx * hx + hy * hy + hz * hz); + hx /= length; + hy /= length; + hz /= length; + final float nh = Math.max(0f, nx * hx + ny * hy + nz * hz); + final float vh = Math.max(0f, VIEW_X * hx + VIEW_Y * hy + VIEW_Z * hz); + final float alpha = roughness * roughness; + final float alpha2 = alpha * alpha; + final float denominator = nh * nh * (alpha2 - 1) + 1; + final float distribution = alpha2 / (3.14159265f * denominator * denominator); + final float k = alpha / 2; + final float visibility = 1 / (4 * (nl * (1 - k) + k) * (nv * (1 - k) + k)); + glare = Math.min(4f, distribution * visibility) * nl * SUN_GLARE; + fresnelSun = pow5(1 - vh); + } + + // 景色の映り込み。粗い面ほどぼやけて、面が受ける光の明るさに近づく + final float reflectedY = 2 * nv * ny - VIEW_Y; + float height = 0.5f + 0.5f * reflectedY; + height = height < 0 ? 0 : height > 1 ? 1 : height; + height = height * height * (3 - 2 * height); + final float sharp = MIRROR_GROUND + (MIRROR_SKY - MIRROR_GROUND) * height; + final float blurred = (GROUND + (SKY - GROUND) * (0.5f + 0.5f * ny)) * 1.6f; + final float mirror = (sharp + (blurred - sharp) * roughness) * occlusion; + // 浅い角度で見るほど、よく映り込む + final float grazing = pow5(1 - facing) * (1 - roughness); + + out[0] = r * diffuse + glare * (f0r + (1 - f0r) * fresnelSun) + mirror * (f0r + (1 - f0r) * grazing); + out[1] = g * diffuse + glare * (f0g + (1 - f0g) * fresnelSun) + mirror * (f0g + (1 - f0g) * grazing); + out[2] = b * diffuse + glare * (f0b + (1 - f0b) * fresnelSun) + mirror * (f0b + (1 - f0b) * grazing); + } + + private static float pow5(float value) { + final float squared = value * value; + return squared * squared * value; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfLoader.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfLoader.java new file mode 100644 index 00000000..1c8063d3 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfLoader.java @@ -0,0 +1,1203 @@ +package marumasa.marumasa_sign.core.gltf; + +import marumasa.marumasa_sign.core.util.Json; + +import javax.imageio.ImageIO; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Base64; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; + +/** + * glTF 2.0 (.gltf / .glb) を読み込む。 + * 描画はどのバージョンでも同じ「テクスチャ 1 枚と頂点の色」で行うため、 + * 材質の情報は読み込みの時点でテクスチャと色にまとめておく。 + */ +public final class GltfLoader { + + // 外部ファイル (バッファや画像) の読み込み + public interface Resources { + byte[] load(String uri) throws IOException; + } + + // 三角形の数の上限 + public static final int MAX_TRIANGLES = 150000; + // テクスチャの大きさの上限 + private static final int MAX_TEXTURE_SIZE = 2048; + // 繰り返しを並べたテクスチャの大きさと枚数の上限 + private static final int MAX_TILED_SIZE = 4096; + private static final int MAX_TILES = 16; + // 陰影を焼き込むテクスチャの、長いほうの辺の最小の長さ + private static final int MIN_BAKE_SIZE = 256; + private static final int MAX_NODES = 65536; + // バッファを持たないアクセサの要素数の上限 + private static final int MAX_EMPTY_ACCESSOR = 1 << 22; + + private static final int GLB_MAGIC = 0x46546C67; + private static final int CHUNK_JSON = 0x4E4F534A; + private static final int CHUNK_BIN = 0x004E4942; + + private static final int WRAP_CLAMP = 33071; + private static final int WRAP_MIRROR = 33648; + private static final int WRAP_REPEAT = 10497; + + private static final float INVERSE_GAMMA = 1f / 2.2f; + + // 対応していない圧縮形式。これが必須のファイルは形を読み取れない + private static final String[] UNSUPPORTED = {"KHR_draco_mesh_compression", "EXT_meshopt_compression"}; + + // 先頭のバイト列が GLB かどうか + public static boolean isGlb(byte[] head, int length) { + return length >= 4 && head[0] == 'g' && head[1] == 'l' && head[2] == 'T' && head[3] == 'F'; + } + + // 先頭のバイト列が JSON らしいかどうか (.gltf の可能性がある) + public static boolean looksLikeJson(byte[] head, int length) { + int i = 0; + if (length >= 3 && (head[0] & 0xFF) == 0xEF && (head[1] & 0xFF) == 0xBB && (head[2] & 0xFF) == 0xBF) i = 3; + while (i < length && (head[i] == ' ' || head[i] == '\t' || head[i] == '\n' || head[i] == '\r')) i++; + return i < length && head[i] == '{'; + } + + public static GltfModel load(byte[] content, Resources resources) throws IOException { + try { + return new GltfLoader(resources).read(content); + } catch (RuntimeException e) { + // 壊れたファイルによる範囲外の参照など + throw new IOException("Invalid glTF: " + e, e); + } + } + + // テクスチャの参照と、その貼り方 + private static final class TexRef { + int texture; + int texCoord; + float offsetX, offsetY, rotation; + float scaleX = 1, scaleY = 1; + int wrapS = WRAP_REPEAT, wrapT = WRAP_REPEAT; + + boolean sameMapping(TexRef other) { + return texCoord == other.texCoord && offsetX == other.offsetX && offsetY == other.offsetY + && rotation == other.rotation && scaleX == other.scaleX && scaleY == other.scaleY + && wrapS == other.wrapS && wrapT == other.wrapT; + } + } + + // 読み込み途中の材質 + private static final class Draft { + final GltfModel.Material material = new GltfModel.Material(); + // テクスチャ座標の元になる参照。テクスチャを使わなければ null + TexRef mapping; + int width, height; + int[] pixels; + final List primitives = new ArrayList(); + // 細かい表現をテクスチャに焼き込むための情報。焼き込む必要がなければ null + GltfBaker.Input bake; + int bakeWidth, bakeHeight; + // 焼き込みで使う、材質のテクスチャ座標とは別の貼り方と、面ごとのその座標 + final List extraRefs = new ArrayList(); + final Map extraUv = new IdentityHashMap(); + } + + private static final class Pixels { + final int width, height; + final int[] argb; + + Pixels(int width, int height, int[] argb) { + this.width = width; + this.height = height; + this.argb = argb; + } + } + + private final Resources resources; + private Map root; + private byte[] glbBinary; + private byte[][] buffers; + private List bufferViews; + private List accessors; + private List textureList; + private List samplerList; + private List imageList; + private Pixels[] images; + private boolean[] imageTried; + + private GltfLoader(Resources resources) { + this.resources = resources; + } + + private GltfModel read(byte[] content) throws IOException { + final String json; + if (isGlb(content, content.length)) { + json = readGlb(content); + } else { + json = new String(content, StandardCharsets.UTF_8); + } + root = Json.object(Json.parse(json)); + if (!root.containsKey("asset")) throw new IOException("Not a glTF file"); + + for (Object required : Json.array(root, "extensionsRequired")) { + for (String name : UNSUPPORTED) { + if (name.equals(required)) throw new IOException("Unsupported glTF extension: " + name); + } + } + + bufferViews = Json.array(root, "bufferViews"); + accessors = Json.array(root, "accessors"); + textureList = Json.array(root, "textures"); + samplerList = Json.array(root, "samplers"); + imageList = Json.array(root, "images"); + images = new Pixels[imageList.size()]; + imageTried = new boolean[imageList.size()]; + readBuffers(); + + final GltfModel model = new GltfModel(); + + // 材質。最後に、材質の指定がない面のための既定の材質を足す + final List materialList = Json.array(root, "materials"); + final Draft[] drafts = new Draft[materialList.size() + 1]; + for (int i = 0; i < drafts.length; i++) { + drafts[i] = draft(i < materialList.size() ? Json.object(materialList.get(i)) : Json.object(null)); + } + + final List meshList = Json.array(root, "meshes"); + model.meshes = new GltfModel.Mesh[meshList.size()]; + for (int i = 0; i < model.meshes.length; i++) { + model.meshes[i] = mesh(Json.object(meshList.get(i)), drafts); + } + + readNodes(model); + readSkins(model); + readAnimations(model); + + // テクスチャ。0 番は白 1 ピクセル + final List textures = new ArrayList(); + textures.add(new GltfModel.Texture(1, 1, new int[]{0xFFFFFFFF})); + model.materials = new GltfModel.Material[drafts.length]; + for (int i = 0; i < drafts.length; i++) { + final Draft draft = drafts[i]; + model.materials[i] = draft.material; + if (draft.primitives.isEmpty()) continue; + if (draft.mapping == null) { + draft.material.texture = 0; + continue; + } + final int[] tilesU = fit(draft, 0, draft.mapping.wrapS, draft.width); + final int[] tilesV = fit(draft, 1, draft.mapping.wrapT, draft.height); + if (draft.bake != null && tilesU[0] == 1 && tilesV[0] == 1) { + final List surfaces = surfaces(model, draft); + int width = draft.bakeWidth, height = draft.bakeHeight; + GltfBaker.Result baked = surfaces == null ? null : GltfBaker.bake(draft.bake, surfaces, width, height); + // 層を並べると大きくなりすぎる場合は、細かさを落としてやり直す + while (baked != null && width * baked.layers > MAX_TILED_SIZE && width > 64) { + width /= 2; + height = Math.max(1, height / 2); + baked = GltfBaker.bake(draft.bake, surfaces, width, height); + } + if (baked != null) { + // 陰影まで計算したテクスチャになったので、描画のときは陰影を付けない + GltfBaker.apply(surfaces, baked.layers); + draft.pixels = baked.pixels; + draft.width = width * baked.layers; + draft.height = height; + draft.material.unlit = true; + model.bakedCount++; + } + } + draft.material.texture = textures.size(); + textures.add(tile(draft, tilesU, tilesV)); + } + model.textures = textures.toArray(new GltfModel.Texture[0]); + + long triangles = 0; + for (GltfModel.Node node : model.nodes) { + if (node.mesh < 0) continue; + for (GltfModel.Primitive primitive : model.meshes[node.mesh].primitives) { + final long count = primitive.indices.length / 3; + triangles += model.materials[primitive.material].doubleSided ? count * 2 : count; + } + } + if (triangles > MAX_TRIANGLES) { + throw new IOException("Model exceeds safety limits (max " + MAX_TRIANGLES + " triangles)"); + } + if (triangles == 0) throw new IOException("Model has nothing to draw"); + model.triangleCount = (int) triangles; + return model; + } + + private String readGlb(byte[] content) throws IOException { + final ByteBuffer buffer = ByteBuffer.wrap(content).order(ByteOrder.LITTLE_ENDIAN); + if (content.length < 20 || buffer.getInt(0) != GLB_MAGIC) throw new IOException("Not a GLB file"); + if (buffer.getInt(4) != 2) throw new IOException("Unsupported GLB version: " + buffer.getInt(4)); + String json = null; + int pos = 12; + while (pos + 8 <= content.length) { + final int length = buffer.getInt(pos); + final int type = buffer.getInt(pos + 4); + pos += 8; + if (length < 0 || pos + (long) length > content.length) throw new IOException("Truncated GLB"); + if (type == CHUNK_JSON && json == null) { + json = new String(content, pos, length, StandardCharsets.UTF_8); + } else if (type == CHUNK_BIN && glbBinary == null) { + glbBinary = new byte[length]; + System.arraycopy(content, pos, glbBinary, 0, length); + } + // 4 バイト境界に揃えられている + pos += (length + 3) & ~3; + } + if (json == null) throw new IOException("GLB has no JSON chunk"); + return json; + } + + private void readBuffers() throws IOException { + final List list = Json.array(root, "buffers"); + buffers = new byte[list.size()][]; + for (int i = 0; i < buffers.length; i++) { + final String uri = Json.string(Json.object(list.get(i)), "uri", null); + if (uri == null) { + buffers[i] = glbBinary != null && i == 0 ? glbBinary : new byte[0]; + } else { + buffers[i] = resource(uri); + } + } + } + + private byte[] resource(String uri) throws IOException { + return resource(uri, resources); + } + + // URI の指すデータを読み込む。data URI はその場で復号する + static byte[] resource(String uri, Resources resources) throws IOException { + if (uri.startsWith("data:")) { + final int comma = uri.indexOf(','); + if (comma < 0) throw new IOException("Invalid data URI"); + final String data = uri.substring(comma + 1); + if (uri.substring(0, comma).endsWith(";base64")) { + try { + return Base64.getMimeDecoder().decode(data); + } catch (IllegalArgumentException e) { + throw new IOException("Invalid data URI", e); + } + } + return data.getBytes(StandardCharsets.UTF_8); + } + if (resources == null) throw new IOException("External resource is not available: " + uri); + return resources.load(uri); + } + + // ---- アクセサ ---- + + private static int componentCount(String type) throws IOException { + if ("SCALAR".equals(type)) return 1; + if ("VEC2".equals(type)) return 2; + if ("VEC3".equals(type)) return 3; + if ("VEC4".equals(type) || "MAT2".equals(type)) return 4; + if ("MAT3".equals(type)) return 9; + if ("MAT4".equals(type)) return 16; + throw new IOException("Unknown accessor type: " + type); + } + + private static int componentSize(int componentType) throws IOException { + switch (componentType) { + case 5120: + case 5121: + return 1; + case 5122: + case 5123: + return 2; + case 5125: + case 5126: + return 4; + default: + throw new IOException("Unknown component type: " + componentType); + } + } + + private static double component(ByteBuffer buffer, int pos, int componentType, boolean normalized) { + switch (componentType) { + case 5120: { + final int value = buffer.get(pos); + return normalized ? Math.max(value / 127.0, -1.0) : value; + } + case 5121: { + final int value = buffer.get(pos) & 0xFF; + return normalized ? value / 255.0 : value; + } + case 5122: { + final int value = buffer.getShort(pos); + return normalized ? Math.max(value / 32767.0, -1.0) : value; + } + case 5123: { + final int value = buffer.getShort(pos) & 0xFFFF; + return normalized ? value / 65535.0 : value; + } + case 5125: + return buffer.getInt(pos) & 0xFFFFFFFFL; + default: + return buffer.getFloat(pos); + } + } + + // バッファビューから count 個の要素を読んで out に入れる + private void readView(int viewIndex, int byteOffset, int componentType, boolean normalized, + int components, int count, double[] out) throws IOException { + final Map view = Json.object(bufferViews.get(viewIndex)); + if (Json.object(view, "extensions").containsKey("EXT_meshopt_compression")) { + throw new IOException("Unsupported glTF extension: EXT_meshopt_compression"); + } + final byte[] data = buffers[Json.integer(view, "buffer", 0)]; + final int viewOffset = Json.integer(view, "byteOffset", 0); + final int viewLength = Json.integer(view, "byteLength", 0); + final int size = componentSize(componentType); + final int elementSize = size * components; + int stride = Json.integer(view, "byteStride", 0); + if (stride <= 0) stride = elementSize; + + final long start = (long) viewOffset + byteOffset; + final long end = count == 0 ? start : start + (long) (count - 1) * stride + elementSize; + if (viewOffset < 0 || byteOffset < 0 || end > (long) viewOffset + viewLength || end > data.length) { + throw new IOException("Accessor is out of range"); + } + final ByteBuffer buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN); + for (int i = 0; i < count; i++) { + final int base = (int) start + i * stride; + for (int c = 0; c < components; c++) { + out[i * components + c] = component(buffer, base + c * size, componentType, normalized); + } + } + } + + private int accessorCount(int index) { + return Json.integer(Json.object(accessors.get(index)), "count", 0); + } + + private int accessorComponents(int index) throws IOException { + return componentCount(Json.string(Json.object(accessors.get(index)), "type", "SCALAR")); + } + + private double[] accessor(int index) throws IOException { + final Map accessor = Json.object(accessors.get(index)); + final int count = Json.integer(accessor, "count", 0); + final int components = componentCount(Json.string(accessor, "type", "SCALAR")); + final int componentType = Json.integer(accessor, "componentType", 5126); + final boolean normalized = Json.bool(accessor, "normalized", false); + if (count < 0) throw new IOException("Invalid accessor"); + + final double[] out; + if (accessor.containsKey("bufferView")) { + // 配列を確保する前に、実際のデータの量で要素数を確かめる + final Map view = Json.object(bufferViews.get(Json.integer(accessor, "bufferView", 0))); + if ((long) count * components * componentSize(componentType) > Json.integer(view, "byteLength", 0)) { + throw new IOException("Accessor is out of range"); + } + out = new double[count * components]; + readView(Json.integer(accessor, "bufferView", 0), Json.integer(accessor, "byteOffset", 0), + componentType, normalized, components, count, out); + } else { + if ((long) count * components > MAX_EMPTY_ACCESSOR) throw new IOException("Accessor is too large"); + out = new double[count * components]; + } + + // 一部の要素だけを上書きする形式 + final Map sparse = Json.object(accessor, "sparse"); + if (!sparse.isEmpty()) { + final int sparseCount = Json.integer(sparse, "count", 0); + if (sparseCount < 0 || sparseCount > count) throw new IOException("Invalid sparse accessor"); + final Map indices = Json.object(sparse, "indices"); + final Map values = Json.object(sparse, "values"); + final double[] targets = new double[sparseCount]; + readView(Json.integer(indices, "bufferView", 0), Json.integer(indices, "byteOffset", 0), + Json.integer(indices, "componentType", 5125), false, 1, sparseCount, targets); + final double[] value = new double[sparseCount * components]; + readView(Json.integer(values, "bufferView", 0), Json.integer(values, "byteOffset", 0), + componentType, normalized, components, sparseCount, value); + for (int i = 0; i < sparseCount; i++) { + final int target = (int) targets[i]; + if (target < 0 || target >= count) throw new IOException("Invalid sparse accessor"); + System.arraycopy(value, i * components, out, target * components, components); + } + } + return out; + } + + private float[] floats(int index) throws IOException { + final double[] values = accessor(index); + final float[] result = new float[values.length]; + for (int i = 0; i < result.length; i++) { + final float value = (float) values[i]; + // 壊れた値で以降の計算が止まらないようにする + result[i] = Float.isNaN(value) || Float.isInfinite(value) ? 0f : value; + } + return result; + } + + private int[] ints(int index) throws IOException { + final double[] values = accessor(index); + final int[] result = new int[values.length]; + for (int i = 0; i < result.length; i++) { + result[i] = (int) values[i]; + } + return result; + } + + // ---- 画像と材質 ---- + + private static float gamma(float linear) { + if (linear <= 0) return 0; + return (float) Math.pow(Math.min(linear, 1f), INVERSE_GAMMA); + } + + // 画像を読み込む。読めない形式なら null + private Pixels image(int index) { + if (index < 0 || index >= images.length) return null; + if (imageTried[index]) return images[index]; + imageTried[index] = true; + try { + final Map json = Json.object(imageList.get(index)); + final byte[] data; + final String uri = Json.string(json, "uri", null); + if (uri != null) { + data = resource(uri); + } else { + final Map view = Json.object(bufferViews.get(Json.integer(json, "bufferView", -1))); + final byte[] buffer = buffers[Json.integer(view, "buffer", 0)]; + final int offset = Json.integer(view, "byteOffset", 0); + final int length = Json.integer(view, "byteLength", 0); + if (offset < 0 || length < 0 || (long) offset + length > buffer.length) return null; + data = new byte[length]; + System.arraycopy(buffer, offset, data, 0, length); + } + BufferedImage decoded = ImageIO.read(new ByteArrayInputStream(data)); + if (decoded == null) return null; + + int width = decoded.getWidth(); + int height = decoded.getHeight(); + if (width > MAX_TEXTURE_SIZE || height > MAX_TEXTURE_SIZE) { + final float ratio = Math.min(MAX_TEXTURE_SIZE / (float) width, MAX_TEXTURE_SIZE / (float) height); + width = Math.max(1, Math.round(width * ratio)); + height = Math.max(1, Math.round(height * ratio)); + final BufferedImage scaled = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); + final Graphics2D g = scaled.createGraphics(); + try { + g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + g.drawImage(decoded, 0, 0, width, height, null); + } finally { + g.dispose(); + } + decoded = scaled; + } + images[index] = new Pixels(width, height, decoded.getRGB(0, 0, width, height, null, 0, width)); + } catch (Exception e) { + // 画像が読めなくても、形だけは表示する + images[index] = null; + } + return images[index]; + } + + private Pixels textureImage(TexRef ref) { + if (ref == null || ref.texture < 0 || ref.texture >= textureList.size()) return null; + final Map texture = Json.object(textureList.get(ref.texture)); + int source = Json.integer(texture, "source", -1); + if (source < 0) { + // 別の形式の画像だけが指定されている場合 + final Map extensions = Json.object(texture, "extensions"); + for (Object extension : extensions.values()) { + source = Json.integer(Json.object(extension), "source", -1); + if (source >= 0) break; + } + } + return image(source); + } + + private TexRef texRef(Map parent, String name) { + if (!parent.containsKey(name)) return null; + final Map info = Json.object(parent, name); + final TexRef ref = new TexRef(); + ref.texture = Json.integer(info, "index", -1); + ref.texCoord = Json.integer(info, "texCoord", 0); + + final Map transform = Json.object(Json.object(info, "extensions"), "KHR_texture_transform"); + if (!transform.isEmpty()) { + final float[] offset = Json.numbers(transform, "offset", new float[]{0, 0}); + final float[] scale = Json.numbers(transform, "scale", new float[]{1, 1}); + ref.offsetX = offset[0]; + ref.offsetY = offset[1]; + ref.scaleX = scale[0]; + ref.scaleY = scale[1]; + ref.rotation = Json.number(transform, "rotation", 0); + ref.texCoord = Json.integer(transform, "texCoord", ref.texCoord); + } + + if (ref.texture >= 0 && ref.texture < textureList.size()) { + final int sampler = Json.integer(Json.object(textureList.get(ref.texture)), "sampler", -1); + if (sampler >= 0 && sampler < samplerList.size()) { + final Map json = Json.object(samplerList.get(sampler)); + ref.wrapS = Json.integer(json, "wrapS", WRAP_REPEAT); + ref.wrapT = Json.integer(json, "wrapT", WRAP_REPEAT); + } + } + return ref; + } + + private Draft draft(Map json) { + final Draft draft = new Draft(); + final GltfModel.Material material = draft.material; + final Map extensions = Json.object(json, "extensions"); + + final Map pbr = Json.object(json, "pbrMetallicRoughness"); + float[] baseFactor = Json.numbers(pbr, "baseColorFactor", new float[]{1, 1, 1, 1}); + TexRef baseRef = texRef(pbr, "baseColorTexture"); + material.metallic = Json.number(pbr, "metallicFactor", 1); + material.roughness = Json.number(pbr, "roughnessFactor", 1); + final float metallicFactor = material.metallic, roughnessFactor = material.roughness; + + // テクスチャで指定されている金属らしさと粗さは、焼き込まない場合、平均を全体の値として使う + final TexRef metallicRoughnessRef = texRef(pbr, "metallicRoughnessTexture"); + final Pixels metallicRoughness = textureImage(metallicRoughnessRef); + if (metallicRoughness != null) { + long green = 0, blue = 0; + int samples = 0; + final int step = Math.max(1, metallicRoughness.argb.length / 4096); + for (int i = 0; i < metallicRoughness.argb.length; i += step) { + green += (metallicRoughness.argb[i] >> 8) & 0xFF; + blue += metallicRoughness.argb[i] & 0xFF; + samples++; + } + material.roughness *= green / (255f * samples); + material.metallic *= blue / (255f * samples); + } + + // 古い形式の材質 + final Map glossiness = Json.object(extensions, "KHR_materials_pbrSpecularGlossiness"); + if (!glossiness.isEmpty()) { + baseFactor = Json.numbers(glossiness, "diffuseFactor", new float[]{1, 1, 1, 1}); + baseRef = texRef(glossiness, "diffuseTexture"); + material.metallic = 0; + material.roughness = 1 - Json.number(glossiness, "glossinessFactor", 1); + } + + final String alphaMode = Json.string(json, "alphaMode", "OPAQUE"); + material.alphaMode = "BLEND".equals(alphaMode) ? GltfModel.ALPHA_BLEND + : "MASK".equals(alphaMode) ? GltfModel.ALPHA_MASK : GltfModel.ALPHA_OPAQUE; + final float alphaCutoff = Json.number(json, "alphaCutoff", 0.5f); + material.doubleSided = Json.bool(json, "doubleSided", false); + material.unlit = extensions.containsKey("KHR_materials_unlit"); + + final float[] emissiveFactor = Json.numbers(json, "emissiveFactor", new float[]{0, 0, 0}); + final float strength = Json.number(Json.object(extensions, "KHR_materials_emissive_strength"), "emissiveStrength", 1); + final float[] emissive = {gamma(emissiveFactor[0] * strength), gamma(emissiveFactor[1] * strength), + gamma(emissiveFactor[2] * strength)}; + final boolean glows = emissive[0] > 0 || emissive[1] > 0 || emissive[2] > 0; + final TexRef emissiveRef = glows ? texRef(json, "emissiveTexture") : null; + final TexRef occlusionRef = texRef(json, "occlusionTexture"); + final float occlusionStrength = Json.number(Json.object(json, "occlusionTexture"), "strength", 1); + + final float[] base = {gamma(baseFactor[0]), gamma(baseFactor[1]), gamma(baseFactor[2]), + Math.max(0, Math.min(1, baseFactor[3]))}; + + final Pixels baseImage = textureImage(baseRef); + final Pixels emissiveImage = textureImage(emissiveRef); + final Pixels occlusionImage = textureImage(occlusionRef); + final TexRef normalRef = material.unlit ? null : texRef(json, "normalTexture"); + final Pixels normalImage = textureImage(normalRef); + final TexRef roughnessRef = material.unlit || !glossiness.isEmpty() ? null : metallicRoughnessRef; + final Pixels roughnessImage = roughnessRef == null ? null : metallicRoughness; + + // テクスチャ座標は、色のテクスチャのものを使う。なければ、ほかに使っているテクスチャのもの + final TexRef mapping = baseImage != null ? baseRef : emissiveImage != null ? emissiveRef + : occlusionImage != null ? occlusionRef : normalImage != null ? normalRef + : roughnessImage != null ? roughnessRef : null; + if (mapping == null) { + // テクスチャがない材質は、頂点の色だけで表す + float alpha = base[3]; + if (material.alphaMode == GltfModel.ALPHA_OPAQUE) alpha = 1; + else if (material.alphaMode == GltfModel.ALPHA_MASK) alpha = alpha >= alphaCutoff ? 1 : 0; + material.color[0] = base[0]; + material.color[1] = base[1]; + material.color[2] = base[2]; + material.color[3] = alpha; + // 発光のテクスチャが読めなかった場合は、全体が光ってしまわないように無視する + if (glows && emissiveRef == null) System.arraycopy(emissive, 0, material.emissive, 0, 3); + return draft; + } + + final Pixels size = baseImage != null ? baseImage : emissiveImage != null ? emissiveImage + : occlusionImage != null ? occlusionImage : normalImage != null ? normalImage : roughnessImage; + final Pixels emissiveMap = emissiveImage != null && emissiveRef.sameMapping(mapping) ? emissiveImage : null; + final Pixels occlusionMap = occlusionImage != null && occlusionRef.sameMapping(mapping) ? occlusionImage : null; + final boolean constantGlow = glows && emissiveRef == null; + + final int width = size.width, height = size.height; + final int[] pixels = new int[width * height]; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + final int source = baseImage != null ? baseImage.argb[y * width + x] : 0xFFFFFFFF; + float r = ((source >> 16) & 0xFF) / 255f * base[0]; + float g = ((source >> 8) & 0xFF) / 255f * base[1]; + float b = (source & 0xFF) / 255f * base[2]; + float a = ((source >>> 24) & 0xFF) / 255f * base[3]; + + if (occlusionMap != null) { + final int sample = sample(occlusionMap, x, y, width, height); + final float occlusion = 1 + occlusionStrength * (((sample >> 16) & 0xFF) / 255f - 1); + final float shade = gamma(occlusion); + r *= shade; + g *= shade; + b *= shade; + } + if (emissiveMap != null) { + final int sample = sample(emissiveMap, x, y, width, height); + r += ((sample >> 16) & 0xFF) / 255f * emissive[0]; + g += ((sample >> 8) & 0xFF) / 255f * emissive[1]; + b += (sample & 0xFF) / 255f * emissive[2]; + } else if (constantGlow) { + r += emissive[0]; + g += emissive[1]; + b += emissive[2]; + } + + if (material.alphaMode == GltfModel.ALPHA_OPAQUE) a = 1; + else if (material.alphaMode == GltfModel.ALPHA_MASK) a = a >= alphaCutoff ? 1 : 0; + + pixels[y * width + x] = (channel(a) << 24) | (channel(r) << 16) | (channel(g) << 8) | channel(b); + } + } + draft.mapping = mapping; + draft.width = width; + draft.height = height; + draft.pixels = pixels; + + // ピクセル単位の計算が必要な表現があれば、あとで陰影ごとテクスチャに焼き込む。 + // 焼き込みでは、別のテクスチャ座標を使っているテクスチャも扱える + final boolean detailed = normalImage != null || roughnessImage != null || emissiveImage != null + || (occlusionImage != null && occlusionMap == null); + if (!material.unlit && detailed) { + final GltfBaker.Input input = new GltfBaker.Input(); + input.base = map(draft, baseImage, baseRef); + input.normal = map(draft, normalImage, normalRef); + input.metallicRoughness = map(draft, roughnessImage, roughnessRef); + input.occlusion = map(draft, occlusionImage, occlusionRef); + input.emissive = map(draft, emissiveImage, emissiveRef); + input.baseFactor = new float[]{Math.max(0, baseFactor[0]), Math.max(0, baseFactor[1]), Math.max(0, baseFactor[2]), base[3]}; + if (emissiveImage != null || constantGlow) { + input.emissiveFactor = new float[]{Math.max(0, emissiveFactor[0] * strength), + Math.max(0, emissiveFactor[1] * strength), Math.max(0, emissiveFactor[2] * strength)}; + } + // テクスチャがあればその値を掛け、なければ係数だけを使う + input.metallic = glossiness.isEmpty() ? metallicFactor : material.metallic; + input.roughness = glossiness.isEmpty() ? roughnessFactor : material.roughness; + input.normalScale = Json.number(Json.object(json, "normalTexture"), "scale", 1); + input.occlusionStrength = occlusionStrength; + input.alphaMode = material.alphaMode; + input.alphaCutoff = alphaCutoff; + draft.bake = input; + for (Pixels image : new Pixels[]{baseImage, normalImage, roughnessImage, emissiveImage}) { + if (image == null) continue; + draft.bakeWidth = Math.max(draft.bakeWidth, image.width); + draft.bakeHeight = Math.max(draft.bakeHeight, image.height); + } + // 陰影はテクスチャの細かさでしか表せないので、小さな画像しか使っていない材質でも、ある程度の細かさにする + while (Math.max(draft.bakeWidth, draft.bakeHeight) < MIN_BAKE_SIZE) { + draft.bakeWidth *= 2; + draft.bakeHeight *= 2; + } + } + return draft; + } + + // 焼き込みに使う画像。材質のテクスチャ座標と違う貼り方のものには、別の座標の番号を割り当てる + private static GltfBaker.Map map(Draft draft, Pixels image, TexRef ref) { + if (image == null) return null; + int slot = 0; + if (!ref.sameMapping(draft.mapping)) { + for (int i = 0; i < draft.extraRefs.size() && slot == 0; i++) { + if (draft.extraRefs.get(i).sameMapping(ref)) slot = i + 1; + } + if (slot == 0) { + draft.extraRefs.add(ref); + slot = draft.extraRefs.size(); + } + } + return new GltfBaker.Map(image.width, image.height, image.argb, slot, + ref.wrapS == WRAP_CLAMP ? 0 : ref.wrapS == WRAP_MIRROR ? 2 : 1, + ref.wrapT == WRAP_CLAMP ? 0 : ref.wrapT == WRAP_MIRROR ? 2 : 1); + } + + // 大きさの違う画像の、同じ位置の色を取り出す + private static int sample(Pixels image, int x, int y, int width, int height) { + final int sx = Math.min(image.width - 1, (int) ((long) x * image.width / width)); + final int sy = Math.min(image.height - 1, (int) ((long) y * image.height / height)); + return image.argb[sy * image.width + sx]; + } + + private static int channel(float value) { + return Math.max(0, Math.min(255, Math.round(value * 255f))); + } + + /** + * 材質を焼き込む対象の面を集める。 + * 陰影はモデルに固定で計算するため、動くモデルや、同じメッシュを複数の場所で使っているモデルは対象にしない (null を返す)。 + */ + private static List surfaces(GltfModel model, Draft draft) { + if (model.animations.length > 0) return null; + + // 最初の姿勢での、各ノードの変換 + final float[][] global = new float[model.nodes.length][]; + for (int index : model.order) { + final GltfModel.Node node = model.nodes[index]; + final float[] local = new float[16]; + if (node.matrix != null) System.arraycopy(node.matrix, 0, local, 0, 16); + else Mat4.compose(node.translation, node.rotation, node.scale, local); + if (node.parent < 0) { + global[index] = local; + } else { + global[index] = new float[16]; + Mat4.multiply(global[node.parent], local, global[index]); + } + } + + final List surfaces = new ArrayList(); + for (GltfModel.Primitive primitive : draft.primitives) { + if (primitive.morphPositions.length > 0) return null; + float[] matrix = null; + for (int index : model.order) { + final GltfModel.Node node = model.nodes[index]; + if (node.mesh < 0) continue; + boolean uses = false; + for (GltfModel.Primitive candidate : model.meshes[node.mesh].primitives) { + if (candidate == primitive) uses = true; + } + if (!uses) continue; + if (matrix != null || node.skin >= 0) return null; + matrix = global[index]; + } + if (matrix != null) surfaces.add(new GltfBaker.Surface(primitive, matrix, draft.extraUv.get(primitive))); + } + return surfaces.isEmpty() ? null : surfaces; + } + + // 繰り返しの指定に合わせて画像を並べたテクスチャを作る。tilesU, tilesV は fit で求めたもの + private static GltfModel.Texture tile(Draft draft, int[] tilesU, int[] tilesV) { + if (tilesU[0] == 1 && tilesV[0] == 1) return new GltfModel.Texture(draft.width, draft.height, draft.pixels); + + final int width = draft.width * tilesU[0], height = draft.height * tilesV[0]; + final int[] columns = new int[width]; + for (int x = 0; x < width; x++) columns[x] = source(x, draft.width, draft.mapping.wrapS, tilesU[1]); + final int[] pixels = new int[width * height]; + for (int y = 0; y < height; y++) { + final int sy = source(y, draft.height, draft.mapping.wrapT, tilesV[1]); + for (int x = 0; x < width; x++) { + pixels[y * width + x] = draft.pixels[sy * draft.width + columns[x]]; + } + } + return new GltfModel.Texture(width, height, pixels); + } + + // 並べたテクスチャの位置に対応する、元の画像の位置 + private static int source(int position, int size, int wrap, int origin) { + if (wrap == WRAP_CLAMP) { + // 元の画像の外側は、端の色を引き伸ばす + return Math.max(0, Math.min(size - 1, position - origin * size)); + } + final int inside = position % size; + return wrap == WRAP_MIRROR && ((position / size) & 1) == 1 ? size - 1 - inside : inside; + } + + /** + * 1 つの軸についてテクスチャ座標を 0 - 1 に収める。 + * 範囲の外を使っている場合は、画像を並べた (端で止める指定なら端の色を引き伸ばした) テクスチャを使うことにして、 + * {並べる枚数, 元の画像を置く位置} を返す。 + */ + private static int[] fit(Draft draft, int axis, int wrap, int size) { + final int limit = Math.max(1, Math.min(MAX_TILES, MAX_TILED_SIZE / Math.max(1, size))); + if (wrap == WRAP_CLAMP) { + float min = 0, max = 1; + for (GltfModel.Primitive primitive : draft.primitives) { + final float[] uv = primitive.cornerUv; + for (int i = axis; i < uv.length; i += 2) { + if (uv[i] < min) min = uv[i]; + if (uv[i] > max) max = uv[i]; + } + } + // 元の画像の前後に必要な枚数。上限を超える分は、座標を端に寄せる + int before = Math.min(limit - 1, (int) Math.ceil(-min - 1e-4f)); + int after = Math.min(limit - 1 - before, (int) Math.ceil(max - 1 - 1e-4f)); + before = Math.max(0, before); + after = Math.max(0, after); + final int count = before + 1 + after; + for (GltfModel.Primitive primitive : draft.primitives) { + final float[] uv = primitive.cornerUv; + for (int i = axis; i < uv.length; i += 2) { + uv[i] = (Math.max(-before, Math.min(1f + after, uv[i])) + before) / count; + } + } + return new int[]{count, before}; + } + + final int period = wrap == WRAP_MIRROR ? 2 : 1; + float max = 1; + for (GltfModel.Primitive primitive : draft.primitives) { + final float[] uv = primitive.cornerUv; + // 三角形ごとに、繰り返しの単位だけずらして 0 の近くに寄せる + for (int i = axis; i + 4 < uv.length; i += 6) { + final float min = Math.min(uv[i], Math.min(uv[i + 2], uv[i + 4])); + final float shift = (float) Math.floor((min + 1e-4f) / period) * period; + for (int k = 0; k < 3; k++) { + uv[i + k * 2] = Math.max(0f, uv[i + k * 2] - shift); + if (uv[i + k * 2] > max) max = uv[i + k * 2]; + } + } + } + final int tiles = Math.max(1, Math.min(limit, (int) Math.ceil(max - 1e-4f))); + for (GltfModel.Primitive primitive : draft.primitives) { + final float[] uv = primitive.cornerUv; + for (int i = axis; i < uv.length; i += 2) { + uv[i] = Math.min(1f, uv[i] / tiles); + } + } + return new int[]{tiles, 0}; + } + + // ---- メッシュ ---- + + private GltfModel.Mesh mesh(Map json, Draft[] drafts) throws IOException { + final GltfModel.Mesh mesh = new GltfModel.Mesh(); + final List primitives = new ArrayList(); + for (Object item : Json.array(json, "primitives")) { + final GltfModel.Primitive primitive = primitive(Json.object(item), drafts); + if (primitive != null) primitives.add(primitive); + } + mesh.primitives = primitives.toArray(new GltfModel.Primitive[0]); + if (json.containsKey("weights")) mesh.weights = Json.numbers(json.get("weights")); + return mesh; + } + + private GltfModel.Primitive primitive(Map json, Draft[] drafts) throws IOException { + if (Json.object(json, "extensions").containsKey("KHR_draco_mesh_compression")) { + throw new IOException("Unsupported glTF extension: KHR_draco_mesh_compression"); + } + final Map attributes = Json.object(json, "attributes"); + if (!attributes.containsKey("POSITION")) return null; + final int mode = Json.integer(json, "mode", 4); + // 点と線は描かない + if (mode < 4 || mode > 6) return null; + + final GltfModel.Primitive primitive = new GltfModel.Primitive(); + final int position = Json.integer(attributes, "POSITION", -1); + primitive.positions = floats(position); + if (accessorComponents(position) != 3) throw new IOException("Invalid POSITION accessor"); + final int count = primitive.positions.length / 3; + primitive.vertexCount = count; + + if (attributes.containsKey("NORMAL")) { + final float[] normals = floats(Json.integer(attributes, "NORMAL", -1)); + if (normals.length == count * 3) primitive.normals = normals; + } + + if (attributes.containsKey("TANGENT")) { + final float[] tangents = floats(Json.integer(attributes, "TANGENT", -1)); + if (tangents.length == count * 4) primitive.tangents = tangents; + } + + if (attributes.containsKey("COLOR_0")) { + final int accessor = Json.integer(attributes, "COLOR_0", -1); + final float[] source = floats(accessor); + final int components = accessorComponents(accessor); + if ((components == 3 || components == 4) && source.length == count * components) { + final float[] colors = new float[count * 4]; + for (int i = 0; i < count; i++) { + colors[i * 4] = gamma(source[i * components]); + colors[i * 4 + 1] = gamma(source[i * components + 1]); + colors[i * 4 + 2] = gamma(source[i * components + 2]); + colors[i * 4 + 3] = components == 4 ? Math.max(0, Math.min(1, source[i * components + 3])) : 1; + } + primitive.colors = colors; + } + } + + readInfluences(primitive, attributes, count); + + // 頂点番号。帯や扇の形式は、三角形の並びに直す + final int[] source; + if (json.containsKey("indices")) { + source = ints(Json.integer(json, "indices", -1)); + for (int index : source) { + if (index < 0 || index >= count) throw new IOException("Vertex index is out of range"); + } + } else { + source = new int[count]; + for (int i = 0; i < count; i++) source[i] = i; + } + primitive.indices = triangles(source, mode); + + // モーフィング + final List targets = Json.array(json, "targets"); + final List morphPositions = new ArrayList(); + final List morphNormals = new ArrayList(); + for (Object item : targets) { + final Map target = Json.object(item); + float[] positions = target.containsKey("POSITION") ? floats(Json.integer(target, "POSITION", -1)) : null; + float[] normals = target.containsKey("NORMAL") ? floats(Json.integer(target, "NORMAL", -1)) : null; + if (positions != null && positions.length != count * 3) positions = null; + if (normals != null && normals.length != count * 3) normals = null; + morphPositions.add(positions); + morphNormals.add(normals); + } + primitive.morphPositions = morphPositions.toArray(new float[0][]); + primitive.morphNormals = morphNormals.toArray(new float[0][]); + + // 材質とテクスチャ座標 + int material = Json.integer(json, "material", -1); + if (material < 0 || material >= drafts.length - 1) material = drafts.length - 1; + primitive.material = material; + final Draft draft = drafts[material]; + draft.primitives.add(primitive); + + primitive.cornerUv = cornerUv(attributes, draft.mapping, primitive.indices, count); + if (!draft.extraRefs.isEmpty()) { + final float[][] extra = new float[draft.extraRefs.size()][]; + for (int i = 0; i < extra.length; i++) { + extra[i] = cornerUv(attributes, draft.extraRefs.get(i), primitive.indices, count); + } + draft.extraUv.put(primitive, extra); + } + return primitive; + } + + // 三角形の角ごとのテクスチャ座標を、テクスチャの貼り方の指定 (ずらし、回転、拡大) を反映して求める + private float[] cornerUv(Map attributes, TexRef mapping, int[] indices, int count) throws IOException { + final float[] result = new float[indices.length * 2]; + final String name = mapping == null ? null : "TEXCOORD_" + mapping.texCoord; + if (name == null || !attributes.containsKey(name)) return result; + final float[] uv = floats(Json.integer(attributes, name, -1)); + if (uv.length != count * 2) return result; + final float cos = (float) Math.cos(mapping.rotation); + final float sin = (float) Math.sin(mapping.rotation); + for (int i = 0; i < indices.length; i++) { + final float u = uv[indices[i] * 2] * mapping.scaleX; + final float v = uv[indices[i] * 2 + 1] * mapping.scaleY; + result[i * 2] = cos * u + sin * v + mapping.offsetX; + result[i * 2 + 1] = -sin * u + cos * v + mapping.offsetY; + } + return result; + } + + private void readInfluences(GltfModel.Primitive primitive, Map attributes, int count) throws IOException { + if (!attributes.containsKey("JOINTS_0") || !attributes.containsKey("WEIGHTS_0")) return; + final int sets = attributes.containsKey("JOINTS_1") && attributes.containsKey("WEIGHTS_1") ? 2 : 1; + final int influences = sets * 4; + final int[] joints = new int[count * influences]; + final float[] weights = new float[count * influences]; + for (int set = 0; set < sets; set++) { + final int[] setJoints = ints(Json.integer(attributes, "JOINTS_" + set, -1)); + final float[] setWeights = floats(Json.integer(attributes, "WEIGHTS_" + set, -1)); + if (setJoints.length != count * 4 || setWeights.length != count * 4) return; + for (int i = 0; i < count; i++) { + for (int k = 0; k < 4; k++) { + joints[i * influences + set * 4 + k] = setJoints[i * 4 + k]; + weights[i * influences + set * 4 + k] = Math.max(0f, setWeights[i * 4 + k]); + } + } + } + // 重みの合計を 1 に揃える + for (int i = 0; i < count; i++) { + float sum = 0; + for (int k = 0; k < influences; k++) sum += weights[i * influences + k]; + if (sum <= 0) { + weights[i * influences] = 1; + } else { + for (int k = 0; k < influences; k++) weights[i * influences + k] /= sum; + } + } + primitive.influences = influences; + primitive.joints = joints; + primitive.weights = weights; + } + + private static int[] triangles(int[] source, int mode) { + if (mode == 4) { + final int[] result = new int[source.length / 3 * 3]; + System.arraycopy(source, 0, result, 0, result.length); + return result; + } + final int count = Math.max(0, source.length - 2); + final int[] result = new int[count * 3]; + for (int i = 0; i < count; i++) { + if (mode == 5) { + // 帯: 1 枚おきに向きが逆になる + result[i * 3] = source[i]; + result[i * 3 + 1] = source[i + 1 + (i & 1)]; + result[i * 3 + 2] = source[i + 2 - (i & 1)]; + } else { + // 扇 + result[i * 3] = source[0]; + result[i * 3 + 1] = source[i + 1]; + result[i * 3 + 2] = source[i + 2]; + } + } + return result; + } + + // ---- ノード、スキン、アニメーション ---- + + private void readNodes(GltfModel model) throws IOException { + final List list = Json.array(root, "nodes"); + if (list.size() > MAX_NODES) throw new IOException("Model exceeds safety limits (max " + MAX_NODES + " nodes)"); + final GltfModel.Node[] nodes = new GltfModel.Node[list.size()]; + for (int i = 0; i < nodes.length; i++) { + final Map json = Json.object(list.get(i)); + final GltfModel.Node node = new GltfModel.Node(); + if (json.containsKey("matrix")) { + final float[] matrix = Json.numbers(json.get("matrix")); + if (matrix.length == 16) node.matrix = matrix; + } + node.translation = Json.numbers(json, "translation", node.translation); + node.rotation = Json.numbers(json, "rotation", node.rotation); + node.scale = Json.numbers(json, "scale", node.scale); + Mat4.normalize4(node.rotation); + + final int mesh = Json.integer(json, "mesh", -1); + if (mesh >= 0 && mesh < model.meshes.length) node.mesh = mesh; + node.skin = Json.integer(json, "skin", -1); + if (json.containsKey("weights")) node.weights = Json.numbers(json.get("weights")); + nodes[i] = node; + } + // 親子関係。親は 1 つだけなので、2 つ目以降の指定は無視する + for (int i = 0; i < nodes.length; i++) { + final List children = Json.array(Json.object(list.get(i)), "children"); + final List valid = new ArrayList(); + for (Object item : children) { + if (!(item instanceof Double)) continue; + final int child = (int) Math.round((Double) item); + if (child < 0 || child >= nodes.length || child == i || nodes[child].parent >= 0) continue; + nodes[child].parent = i; + valid.add(child); + } + nodes[i].children = new int[valid.size()]; + for (int k = 0; k < valid.size(); k++) nodes[i].children[k] = valid.get(k); + } + + // 表示するシーン + final List scenes = Json.array(root, "scenes"); + final List roots = new ArrayList(); + if (!scenes.isEmpty()) { + int scene = Json.integer(root, "scene", 0); + if (scene < 0 || scene >= scenes.size()) scene = 0; + for (Object item : Json.array(Json.object(scenes.get(scene)), "nodes")) { + if (!(item instanceof Double)) continue; + final int node = (int) Math.round((Double) item); + if (node >= 0 && node < nodes.length && nodes[node].parent < 0 && !roots.contains(node)) roots.add(node); + } + } else { + for (int i = 0; i < nodes.length; i++) { + if (nodes[i].parent < 0) roots.add(i); + } + } + + // 親が先になる順に並べる。シーンに含まれないノードと、循環している部分は除かれる + final int[] order = new int[nodes.length]; + int length = 0; + for (int node : roots) order[length++] = node; + for (int i = 0; i < length; i++) { + for (int child : nodes[order[i]].children) order[length++] = child; + } + final boolean[] reachable = new boolean[nodes.length]; + for (int i = 0; i < length; i++) reachable[order[i]] = true; + for (int i = 0; i < nodes.length; i++) { + // シーンに含まれないノードのメッシュは描かない + if (!reachable[i]) nodes[i].mesh = -1; + } + model.nodes = nodes; + model.order = new int[length]; + System.arraycopy(order, 0, model.order, 0, length); + } + + private void readSkins(GltfModel model) throws IOException { + final List list = Json.array(root, "skins"); + model.skins = new GltfModel.Skin[list.size()]; + for (int i = 0; i < model.skins.length; i++) { + final Map json = Json.object(list.get(i)); + final GltfModel.Skin skin = new GltfModel.Skin(); + final float[] joints = Json.numbers(json.get("joints")); + skin.joints = new int[joints.length]; + for (int k = 0; k < joints.length; k++) { + final int joint = (int) joints[k]; + skin.joints[k] = joint >= 0 && joint < model.nodes.length ? joint : -1; + } + if (json.containsKey("inverseBindMatrices")) { + final float[] matrices = floats(Json.integer(json, "inverseBindMatrices", -1)); + if (matrices.length >= skin.joints.length * 16) skin.inverseBind = matrices; + } + if (skin.inverseBind == null) { + skin.inverseBind = new float[skin.joints.length * 16]; + for (int k = 0; k < skin.joints.length; k++) { + System.arraycopy(Mat4.identity(), 0, skin.inverseBind, k * 16, 16); + } + } + model.skins[i] = skin; + } + for (GltfModel.Node node : model.nodes) { + if (node.skin >= model.skins.length) node.skin = -1; + } + } + + private void readAnimations(GltfModel model) throws IOException { + final List list = Json.array(root, "animations"); + final List animations = new ArrayList(); + for (Object item : list) { + final Map json = Json.object(item); + final List samplers = Json.array(json, "samplers"); + final List channels = new ArrayList(); + float duration = 0; + for (Object channelItem : Json.array(json, "channels")) { + final Map channelJson = Json.object(channelItem); + final Map target = Json.object(channelJson, "target"); + final int samplerIndex = Json.integer(channelJson, "sampler", -1); + final int node = Json.integer(target, "node", -1); + if (samplerIndex < 0 || samplerIndex >= samplers.size() || node < 0 || node >= model.nodes.length) continue; + final Map sampler = Json.object(samplers.get(samplerIndex)); + + final GltfModel.Channel channel = new GltfModel.Channel(); + channel.node = node; + final String path = Json.string(target, "path", ""); + if ("translation".equals(path)) channel.path = GltfModel.PATH_TRANSLATION; + else if ("rotation".equals(path)) channel.path = GltfModel.PATH_ROTATION; + else if ("scale".equals(path)) channel.path = GltfModel.PATH_SCALE; + else if ("weights".equals(path)) channel.path = GltfModel.PATH_WEIGHTS; + else continue; + + final String interpolation = Json.string(sampler, "interpolation", "LINEAR"); + channel.interpolation = "STEP".equals(interpolation) ? GltfModel.INTERPOLATION_STEP + : "CUBICSPLINE".equals(interpolation) ? GltfModel.INTERPOLATION_CUBIC : GltfModel.INTERPOLATION_LINEAR; + channel.times = floats(Json.integer(sampler, "input", -1)); + channel.values = floats(Json.integer(sampler, "output", -1)); + final int keys = channel.times.length; + if (keys == 0) continue; + final int perKey = channel.interpolation == GltfModel.INTERPOLATION_CUBIC ? 3 : 1; + if (channel.values.length % (keys * perKey) != 0) continue; + channel.components = channel.values.length / (keys * perKey); + final int expected = channel.path == GltfModel.PATH_ROTATION ? 4 : 3; + if (channel.path != GltfModel.PATH_WEIGHTS && channel.components != expected) continue; + if (channel.components == 0) continue; + + duration = Math.max(duration, channel.times[keys - 1]); + channels.add(channel); + } + if (channels.isEmpty()) continue; + final GltfModel.Animation animation = new GltfModel.Animation(); + animation.channels = channels.toArray(new GltfModel.Channel[0]); + animation.duration = duration; + animations.add(animation); + } + model.animations = animations.toArray(new GltfModel.Animation[0]); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfModel.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfModel.java new file mode 100644 index 00000000..c4543e16 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfModel.java @@ -0,0 +1,147 @@ +package marumasa.marumasa_sign.core.gltf; + +/** + * 読み込んだ glTF のモデル。読み込んだあとは変更しない。 + */ +public final class GltfModel { + + public static final int ALPHA_OPAQUE = 0; + public static final int ALPHA_MASK = 1; + public static final int ALPHA_BLEND = 2; + + static final int PATH_TRANSLATION = 0; + static final int PATH_ROTATION = 1; + static final int PATH_SCALE = 2; + static final int PATH_WEIGHTS = 3; + + static final int INTERPOLATION_LINEAR = 0; + static final int INTERPOLATION_STEP = 1; + static final int INTERPOLATION_CUBIC = 2; + + static final class Node { + int parent = -1; + int[] children = new int[0]; + float[] translation = {0, 0, 0}; + float[] rotation = {0, 0, 0, 1}; + float[] scale = {1, 1, 1}; + // 行列で指定されている場合の値。そうでなければ null + float[] matrix; + int mesh = -1; + int skin = -1; + // モーフィングの重みの初期値。指定がなければ null + float[] weights; + } + + static final class Primitive { + int vertexCount; + // 頂点ごとの値 + float[] positions; + // 法線。指定がなければ null で、面ごとに計算する + float[] normals; + // 接線 (x, y, z と、従法線の向きを表す符号)。指定がなければ null + float[] tangents; + // 頂点の色 (表示用の色空間に直した r, g, b, a)。指定がなければ null + float[] colors; + // 頂点に影響するボーンの数 (0, 4, 8) + int influences; + int[] joints; + float[] weights; + // 三角形の頂点番号 (3 つで 1 枚) + int[] indices; + // 三角形の角ごとのテクスチャ座標。indices と同じ並びで、1 つにつき u, v + float[] cornerUv; + int material; + // モーフィングの変化量。使わなければ長さ 0 + float[][] morphPositions = new float[0][]; + float[][] morphNormals = new float[0][]; + } + + static final class Mesh { + Primitive[] primitives = new Primitive[0]; + float[] weights; + } + + static final class Skin { + int[] joints = new int[0]; + // ボーンごとの 4x4 行列を並べたもの + float[] inverseBind; + } + + public static final class Material { + // 描画に使うテクスチャの番号 (GltfModel.textures の添字) + public int texture; + // 頂点の色に掛ける色 (表示用の色空間)。テクスチャに焼き込んだ場合は白 + final float[] color = {1, 1, 1, 1}; + // 頂点の色に足す発光色。テクスチャに焼き込んだ場合は 0 + final float[] emissive = {0, 0, 0}; + float metallic = 1; + float roughness = 1; + public int alphaMode = ALPHA_OPAQUE; + public boolean doubleSided; + // 陰影を付けない + boolean unlit; + } + + public static final class Texture { + public final int width; + public final int height; + // ARGB + public final int[] pixels; + + Texture(int width, int height, int[] pixels) { + this.width = width; + this.height = height; + this.pixels = pixels; + } + } + + static final class Channel { + int node; + int path; + int interpolation; + float[] times; + float[] values; + // キーフレーム 1 つあたりの要素数 (3 次スプラインの接線は含まない) + int components; + } + + static final class Animation { + Channel[] channels = new Channel[0]; + float duration; + } + + Node[] nodes = new Node[0]; + // 表示するシーンに含まれるノードを、親が先になる順に並べたもの + int[] order = new int[0]; + Mesh[] meshes = new Mesh[0]; + Skin[] skins = new Skin[0]; + Material[] materials = new Material[0]; + Texture[] textures = new Texture[0]; + Animation[] animations = new Animation[0]; + int triangleCount; + // 陰影をテクスチャに焼き込んだ材質の数 + int bakedCount; + + GltfModel() { + } + + public int textureCount() { + return textures.length; + } + + public Texture texture(int index) { + return textures[index]; + } + + public int triangleCount() { + return triangleCount; + } + + public int bakedCount() { + return bakedCount; + } + + public boolean isAnimated() { + return animations.length > 0; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfPacker.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfPacker.java new file mode 100644 index 00000000..e5c976b4 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfPacker.java @@ -0,0 +1,123 @@ +package marumasa.marumasa_sign.core.gltf; + +import marumasa.marumasa_sign.core.util.Json; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * 外部ファイルを参照している .gltf を、1 つの .glb にまとめる。 + * アップロードできるのはファイル 1 つだけなので、バッファと画像を中に取り込む。 + */ +public final class GltfPacker { + + private static final int GLB_MAGIC = 0x46546C67; + private static final int CHUNK_JSON = 0x4E4F534A; + private static final int CHUNK_BIN = 0x004E4942; + + private GltfPacker() { + } + + /** + * @param json .gltf の内容 + * @param resources 参照されているファイルの読み込み + * @return .glb の内容 + */ + public static byte[] pack(byte[] json, GltfLoader.Resources resources) throws IOException { + final Map root; + try { + root = new LinkedHashMap(Json.object(Json.parse(new String(json, StandardCharsets.UTF_8)))); + } catch (RuntimeException e) { + throw new IOException("Invalid glTF: " + e, e); + } + if (!root.containsKey("asset")) throw new IOException("Not a glTF file"); + + final ByteArrayOutputStream binary = new ByteArrayOutputStream(); + + // バッファを 1 つにつなげる + final List buffers = Json.array(root, "buffers"); + final int[] offsets = new int[buffers.size()]; + for (int i = 0; i < offsets.length; i++) { + final String uri = Json.string(Json.object(buffers.get(i)), "uri", null); + offsets[i] = append(binary, uri == null ? new byte[0] : GltfLoader.resource(uri, resources)); + } + + final List views = new ArrayList(); + for (Object item : Json.array(root, "bufferViews")) { + final Map view = new LinkedHashMap(Json.object(item)); + final int buffer = Json.integer(view, "buffer", 0); + if (buffer < 0 || buffer >= offsets.length) throw new IOException("Invalid buffer view"); + view.put("buffer", 0.0); + view.put("byteOffset", (double) (Json.integer(view, "byteOffset", 0) + offsets[buffer])); + views.add(view); + } + + // 画像を取り込む + final List images = new ArrayList(); + for (Object item : Json.array(root, "images")) { + final Map image = new LinkedHashMap(Json.object(item)); + final String uri = Json.string(image, "uri", null); + if (uri != null) { + final byte[] data = GltfLoader.resource(uri, resources); + final Map view = new LinkedHashMap(); + view.put("buffer", 0.0); + view.put("byteOffset", (double) append(binary, data)); + view.put("byteLength", (double) data.length); + image.remove("uri"); + image.put("bufferView", (double) views.size()); + if (!image.containsKey("mimeType")) image.put("mimeType", mimeType(data)); + views.add(view); + } + images.add(image); + } + + final Map buffer = new LinkedHashMap(); + buffer.put("byteLength", (double) binary.size()); + final List packedBuffers = new ArrayList(); + packedBuffers.add(buffer); + if (binary.size() > 0) root.put("buffers", packedBuffers); + else root.remove("buffers"); + if (!views.isEmpty()) root.put("bufferViews", views); + if (!images.isEmpty()) root.put("images", images); + + final byte[] text = pad(Json.write(root).getBytes(StandardCharsets.UTF_8), (byte) ' '); + final byte[] data = pad(binary.toByteArray(), (byte) 0); + final int length = 12 + 8 + text.length + (data.length > 0 ? 8 + data.length : 0); + final ByteBuffer out = ByteBuffer.allocate(length).order(ByteOrder.LITTLE_ENDIAN); + out.putInt(GLB_MAGIC).putInt(2).putInt(length); + out.putInt(text.length).putInt(CHUNK_JSON).put(text); + if (data.length > 0) out.putInt(data.length).putInt(CHUNK_BIN).put(data); + return out.array(); + } + + // 4 バイト境界に揃えてから追加し、追加した位置を返す + private static int append(ByteArrayOutputStream binary, byte[] data) { + while ((binary.size() & 3) != 0) binary.write(0); + final int offset = binary.size(); + binary.write(data, 0, data.length); + return offset; + } + + private static byte[] pad(byte[] data, byte filler) { + final int length = (data.length + 3) & ~3; + if (length == data.length) return data; + final byte[] result = new byte[length]; + System.arraycopy(data, 0, result, 0, data.length); + for (int i = data.length; i < length; i++) result[i] = filler; + return result; + } + + private static String mimeType(byte[] data) { + if (data.length >= 3 && (data[0] & 0xFF) == 0xFF && (data[1] & 0xFF) == 0xD8) return "image/jpeg"; + if (data.length >= 12 && data[0] == 'R' && data[1] == 'I' && data[8] == 'W' && data[9] == 'E') return "image/webp"; + if (data.length >= 12 && (data[0] & 0xFF) == 0xAB && data[1] == 'K' && data[2] == 'T' && data[3] == 'X') return "image/ktx2"; + return "image/png"; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfPreview.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfPreview.java new file mode 100644 index 00000000..7ac091cf --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfPreview.java @@ -0,0 +1,150 @@ +package marumasa.marumasa_sign.core.gltf; + +import java.awt.image.BufferedImage; + +/** + * 3D モデルを画像に描く。設定画面のプレビューに使う。 + */ +public final class GltfPreview { + + private GltfPreview() { + } + + /** + * モデルを斜め上から見た絵を返す。背景は透明。 + * + * @param time アニメーションの時刻 (秒) + * @param size 画像の一辺の長さ + */ + public static BufferedImage render(GltfScene scene, float time, int size) { + final int[] frame = new int[size * size]; + final float[] depth = new float[size * size]; + java.util.Arrays.fill(depth, Float.NEGATIVE_INFINITY); + render(scene, time, size, frame, depth); + final BufferedImage image = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB); + image.setRGB(0, 0, size, size, frame, 0, size); + return image; + } + + // frame (ARGB) にモデルを描き足す + public static void render(GltfScene scene, float time, int size, int[] frame, float[] depth) { + final float[] box = scene.restBounds(); + final float cx = (box[0] + box[3]) / 2, cy = (box[1] + box[4]) / 2, cz = (box[2] + box[5]) / 2; + final float extent = Math.max(box[3] - box[0], Math.max(box[4] - box[1], box[5] - box[2])); + final float fit = extent > 0 ? 1.1f / extent : 1f; + + // 斜め上から見る + final double yaw = Math.toRadians(30), pitch = Math.toRadians(20); + final float cosY = (float) Math.cos(yaw), sinY = (float) Math.sin(yaw); + final float cosP = (float) Math.cos(pitch), sinP = (float) Math.sin(pitch); + final float[] center = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -cx, -cy, -cz, 1}; + final float[] rotateY = {cosY, 0, -sinY, 0, 0, 1, 0, 0, sinY, 0, cosY, 0, 0, 0, 0, 1}; + final float[] rotateX = {1, 0, 0, 0, 0, cosP, sinP, 0, 0, -sinP, cosP, 0, 0, 0, 0, 1}; + final float[] scale = {fit, 0, 0, 0, 0, fit, 0, 0, 0, 0, fit, 0, 0, 0, 0, 1}; + final float[] a = new float[16], b = new float[16], placement = new float[16]; + Mat4.multiply(rotateY, center, a); + Mat4.multiply(rotateX, a, b); + Mat4.multiply(scale, b, placement); + + final GltfScene.Group[] groups = scene.groups(); + final float[][] vertices = new float[groups.length][]; + final int[][] colors = new int[groups.length][]; + for (int i = 0; i < groups.length; i++) { + vertices[i] = new float[groups[i].vertexCount() * GltfScene.STRIDE]; + colors[i] = new int[groups[i].vertexCount()]; + } + scene.pose(time); + scene.emit(placement, vertices, colors); + + for (int g = 0; g < groups.length; g++) { + final GltfModel.Texture texture = scene.model().texture(groups[g].texture); + draw(frame, depth, size, vertices[g], colors[g], groups[g].vertexCount(), + texture.width, texture.height, texture.pixels, groups[g].blend); + } + } + + /** + * 四角形の列を描く。頂点は x, y, z, u, v の順で、x, y は -1 から 1 が画面の範囲、z は大きいほど手前。 + * 反時計回りに見える面だけを描く。colors が null なら白として扱う。 + */ + public static void draw(int[] frame, float[] depth, int size, float[] vertices, int[] colors, int vertexCount, + int textureWidth, int textureHeight, int[] texture, boolean blend) { + final int[] corner = new int[3]; + final float[] sx = new float[3], sy = new float[3]; + for (int v = 0; v + 3 < vertexCount; v += 4) { + // 四角形は三角形 2 枚に分ける。3D モデルの三角形は 2 枚目の面積が 0 になる + for (int half = 0; half < 2; half++) { + corner[0] = v; + corner[1] = v + 1 + half; + corner[2] = v + 2 + half; + triangle(frame, depth, size, vertices, colors, corner, sx, sy, textureWidth, textureHeight, texture, blend); + } + } + } + + private static void triangle(int[] frame, float[] depth, int size, float[] vertices, int[] colors, int[] corner, + float[] sx, float[] sy, int textureWidth, int textureHeight, int[] texture, boolean blend) { + for (int k = 0; k < 3; k++) { + sx[k] = (vertices[corner[k] * GltfScene.STRIDE] * 0.5f + 0.5f) * size; + sy[k] = (0.5f - vertices[corner[k] * GltfScene.STRIDE + 1] * 0.5f) * size; + } + // 画面の y は下向きなので、表 (反時計回り) の面積は負になる + final float area = (sx[1] - sx[0]) * (sy[2] - sy[0]) - (sx[2] - sx[0]) * (sy[1] - sy[0]); + if (area >= 0) return; + + final int minX = Math.max(0, (int) Math.floor(Math.min(sx[0], Math.min(sx[1], sx[2])))); + final int maxX = Math.min(size - 1, (int) Math.ceil(Math.max(sx[0], Math.max(sx[1], sx[2])))); + final int minY = Math.max(0, (int) Math.floor(Math.min(sy[0], Math.min(sy[1], sy[2])))); + final int maxY = Math.min(size - 1, (int) Math.ceil(Math.max(sy[0], Math.max(sy[1], sy[2])))); + final int colorA = colors == null ? 0xFFFFFFFF : colors[corner[0]]; + final int colorB = colors == null ? 0xFFFFFFFF : colors[corner[1]]; + final int colorC = colors == null ? 0xFFFFFFFF : colors[corner[2]]; + + for (int y = minY; y <= maxY; y++) { + for (int x = minX; x <= maxX; x++) { + final float px = x + 0.5f, py = y + 0.5f; + final float w0 = ((sx[1] - px) * (sy[2] - py) - (sx[2] - px) * (sy[1] - py)) / area; + final float w1 = ((sx[2] - px) * (sy[0] - py) - (sx[0] - px) * (sy[2] - py)) / area; + final float w2 = 1 - w0 - w1; + if (w0 < 0 || w1 < 0 || w2 < 0) continue; + + final float z = value(vertices, corner, 2, w0, w1, w2); + final int pixel = y * size + x; + if (z <= depth[pixel]) continue; + + final float u = value(vertices, corner, 3, w0, w1, w2); + final float v = value(vertices, corner, 4, w0, w1, w2); + final int tx = Math.max(0, Math.min(textureWidth - 1, (int) (u * textureWidth))); + final int ty = Math.max(0, Math.min(textureHeight - 1, (int) (v * textureHeight))); + final int texel = texture[ty * textureWidth + tx]; + + final int behind = frame[pixel]; + final float behindAlpha = (behind >>> 24) / 255f; + float alpha = 1; + int result = 0; + for (int shift = 24; shift >= 0; shift -= 8) { + final float color = (((colorA >>> shift) & 0xFF) * w0 + ((colorB >>> shift) & 0xFF) * w1 + + ((colorC >>> shift) & 0xFF) * w2) / 255f; + final float value = color * ((texel >>> shift) & 0xFF) / 255f; + if (shift == 24) { + alpha = value; + } else { + // 半透明の面は、すでに描かれている色と混ぜる + final float under = ((behind >>> shift) & 0xFF) / 255f * behindAlpha; + final float mixed = blend ? under + (value - under) * alpha : value; + result |= Math.max(0, Math.min(255, Math.round(mixed * 255))) << shift; + } + } + if (alpha < 0.1f) continue; + final float coverage = blend ? Math.max(behindAlpha, alpha) : 1f; + frame[pixel] = result | (Math.round(coverage * 255) << 24); + if (!blend) depth[pixel] = z; + } + } + } + + private static float value(float[] vertices, int[] corner, int element, float w0, float w1, float w2) { + return vertices[corner[0] * GltfScene.STRIDE + element] * w0 + vertices[corner[1] * GltfScene.STRIDE + element] * w1 + + vertices[corner[2] * GltfScene.STRIDE + element] * w2; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfScene.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfScene.java new file mode 100644 index 00000000..9dc7d7f1 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/GltfScene.java @@ -0,0 +1,566 @@ +package marumasa.marumasa_sign.core.gltf; + +import java.util.ArrayList; +import java.util.List; + +/** + * 読み込んだモデルを、ある時刻の姿勢で三角形の列にする。 + * アニメーション、スキニング、モーフィングと陰影の計算はすべてここで行い、 + * 結果は「テクスチャごとの頂点と色」になる。三角形は 3 つ目の頂点を重ねた四角形として出す。 + * 1 つのスレッドから使うこと。 + */ +public final class GltfScene { + + // 頂点 1 つあたりの要素数: x, y, z, u, v + public static final int STRIDE = 5; + + // 同じテクスチャで描く面のまとまり + public static final class Group { + public final int texture; + // 半透明かどうか。半透明のものは後ろに並ぶ + public final boolean blend; + int vertexCount; + + Group(int texture, boolean blend) { + this.texture = texture; + this.blend = blend; + } + + public int vertexCount() { + return vertexCount; + } + } + + + private final GltfModel model; + private final Group[] groups; + // メッシュごと・面ごとの、groups の添字 + private final int[][] groupIndex; + + private final int nodeCount; + private final float[] translation; + private final float[] rotation; + private final float[] scale; + private final float[][] weights; + private final float[] local; + private final float[] global; + private float posedTime = Float.NaN; + private float[] restBounds; + + // 計算用の領域 + private final float[] matrix = new float[16]; + private final float[] matrix2 = new float[16]; + private final float[] normal = new float[9]; + private final float[] sample = new float[4]; + private float[] jointMatrices = new float[0]; + private float[] jointNormals = new float[0]; + private float[] positions = new float[0]; + private int[] front = new int[0]; + private int[] back = new int[0]; + private final float[] lit = new float[3]; + private final int[] cursor; + // 材質ごとの、頂点の色に掛ける色 (リニア) + private final float[] materialColor; + // 描画する座標の法線を、モデルの座標に戻すための行列 (配置の行列の左上 3x3 の転置) + private final float[] toModel = new float[9]; + + public GltfScene(GltfModel model) { + this.model = model; + nodeCount = model.nodes.length; + translation = new float[nodeCount * 3]; + rotation = new float[nodeCount * 4]; + scale = new float[nodeCount * 3]; + weights = new float[nodeCount][]; + local = new float[nodeCount * 16]; + global = new float[nodeCount * 16]; + + // 不透明なものを先に、半透明なものを後に並べる + final List list = new ArrayList(); + groupIndex = new int[model.meshes.length][]; + for (int pass = 0; pass < 2; pass++) { + for (int m = 0; m < model.meshes.length; m++) { + final GltfModel.Primitive[] primitives = model.meshes[m].primitives; + if (groupIndex[m] == null) groupIndex[m] = new int[primitives.length]; + for (int p = 0; p < primitives.length; p++) { + final GltfModel.Material material = model.materials[primitives[p].material]; + final boolean blend = material.alphaMode == GltfModel.ALPHA_BLEND; + if (blend != (pass == 1)) continue; + int index = -1; + for (int i = 0; i < list.size(); i++) { + if (list.get(i).texture == material.texture && list.get(i).blend == blend) index = i; + } + if (index < 0) { + index = list.size(); + list.add(new Group(material.texture, blend)); + } + groupIndex[m][p] = index; + } + } + } + groups = list.toArray(new Group[0]); + cursor = new int[groups.length]; + + materialColor = new float[model.materials.length * 3]; + for (int i = 0; i < model.materials.length; i++) { + for (int c = 0; c < 3; c++) { + materialColor[i * 3 + c] = GltfLight.toLinear(model.materials[i].color[c]); + } + } + + for (int node : model.order) { + final int mesh = model.nodes[node].mesh; + if (mesh < 0) continue; + final GltfModel.Primitive[] primitives = model.meshes[mesh].primitives; + int targets = 0; + for (int p = 0; p < primitives.length; p++) { + final int quads = primitives[p].indices.length / 3; + final boolean doubleSided = model.materials[primitives[p].material].doubleSided; + groups[groupIndex[mesh][p]].vertexCount += quads * 4 * (doubleSided ? 2 : 1); + targets = Math.max(targets, primitives[p].morphPositions.length); + } + if (targets > 0) weights[node] = new float[targets]; + } + } + + public GltfModel model() { + return model; + } + + public Group[] groups() { + return groups; + } + + public boolean isAnimated() { + return model.animations.length > 0; + } + + // ---- 姿勢 ---- + + /** + * 指定した時刻 (秒) の姿勢にする。アニメーションは繰り返す。 + */ + public void pose(float time) { + if (time == posedTime) return; + posedTime = time; + + for (int i = 0; i < nodeCount; i++) { + final GltfModel.Node node = model.nodes[i]; + System.arraycopy(node.translation, 0, translation, i * 3, 3); + System.arraycopy(node.rotation, 0, rotation, i * 4, 4); + System.arraycopy(node.scale, 0, scale, i * 3, 3); + final float[] target = weights[i]; + if (target != null) { + final float[] source = node.weights != null ? node.weights : model.meshes[node.mesh].weights; + for (int k = 0; k < target.length; k++) { + target[k] = source != null && k < source.length ? source[k] : 0f; + } + } + } + + if (model.animations.length > 0) { + final GltfModel.Animation animation = model.animations[0]; + final float t = animation.duration > 0 ? time % animation.duration : 0f; + for (GltfModel.Channel channel : animation.channels) { + apply(channel, t); + } + } + + final float[] t = new float[3], r = new float[4], s = new float[3]; + for (int i : model.order) { + final GltfModel.Node node = model.nodes[i]; + if (node.matrix != null) { + System.arraycopy(node.matrix, 0, matrix, 0, 16); + } else { + System.arraycopy(translation, i * 3, t, 0, 3); + System.arraycopy(rotation, i * 4, r, 0, 4); + System.arraycopy(scale, i * 3, s, 0, 3); + Mat4.compose(t, r, s, matrix); + } + System.arraycopy(matrix, 0, local, i * 16, 16); + if (node.parent < 0) { + System.arraycopy(matrix, 0, global, i * 16, 16); + } else { + System.arraycopy(global, node.parent * 16, matrix2, 0, 16); + final float[] out = new float[16]; + Mat4.multiply(matrix2, matrix, out); + System.arraycopy(out, 0, global, i * 16, 16); + } + } + } + + private void apply(GltfModel.Channel channel, float time) { + final float[] times = channel.times; + final float[] values = channel.values; + final int components = channel.components; + final int keys = times.length; + final boolean cubic = channel.interpolation == GltfModel.INTERPOLATION_CUBIC; + // 3 次スプラインは、キーごとに「入りの接線、値、出の接線」の順で並んでいる + final int keySize = cubic ? components * 3 : components; + final int valueOffset = cubic ? components : 0; + + final float[] out; + final int outOffset; + if (channel.path == GltfModel.PATH_WEIGHTS) { + out = weights[channel.node]; + outOffset = 0; + if (out == null) return; + } else if (channel.path == GltfModel.PATH_ROTATION) { + out = rotation; + outOffset = channel.node * 4; + } else { + out = channel.path == GltfModel.PATH_TRANSLATION ? translation : scale; + outOffset = channel.node * 3; + } + final int count = channel.path == GltfModel.PATH_WEIGHTS ? Math.min(components, out.length) : components; + + int key; + if (time <= times[0]) { + key = 0; + } else if (time >= times[keys - 1]) { + key = keys - 1; + } else { + int low = 0, high = keys - 1; + while (high - low > 1) { + final int mid = (low + high) >>> 1; + if (times[mid] <= time) low = mid; + else high = mid; + } + key = low; + } + + final boolean held = key == keys - 1 || time <= times[0] || channel.interpolation == GltfModel.INTERPOLATION_STEP; + if (held) { + System.arraycopy(values, key * keySize + valueOffset, out, outOffset, count); + if (channel.path == GltfModel.PATH_ROTATION) normalizeRotation(out, outOffset); + return; + } + + final float span = times[key + 1] - times[key]; + final float u = span > 0 ? (time - times[key]) / span : 0f; + final int a = key * keySize + valueOffset; + final int b = (key + 1) * keySize + valueOffset; + if (cubic) { + final float u2 = u * u, u3 = u2 * u; + final float h00 = 2 * u3 - 3 * u2 + 1; + final float h10 = (u3 - 2 * u2 + u) * span; + final float h01 = -2 * u3 + 3 * u2; + final float h11 = (u3 - u2) * span; + for (int c = 0; c < count; c++) { + out[outOffset + c] = h00 * values[a + c] + h10 * values[a + components + c] + + h01 * values[b + c] + h11 * values[b - components + c]; + } + if (channel.path == GltfModel.PATH_ROTATION) normalizeRotation(out, outOffset); + } else if (channel.path == GltfModel.PATH_ROTATION) { + Mat4.slerp(values, a, values, b, u, sample); + System.arraycopy(sample, 0, out, outOffset, 4); + } else { + for (int c = 0; c < count; c++) { + out[outOffset + c] = values[a + c] + (values[b + c] - values[a + c]) * u; + } + } + } + + private void normalizeRotation(float[] array, int offset) { + System.arraycopy(array, offset, sample, 0, 4); + Mat4.normalize4(sample); + System.arraycopy(sample, 0, array, offset, 4); + } + + // ---- 三角形の出力 ---- + + /** + * 現在の姿勢の三角形を出力する。 + * + * @param placement モデルの座標から描画する座標への変換 (列優先の 4x4) + * @param vertices groups() と同じ並びの出力先。それぞれ vertexCount * STRIDE 以上の長さ + * @param colors 頂点ごとの色 (ARGB) の出力先。それぞれ vertexCount 以上の長さ + */ + public void emit(float[] placement, float[][] vertices, int[][] colors) { + if (Float.isNaN(posedTime)) pose(0); + for (int i = 0; i < cursor.length; i++) cursor[i] = 0; + for (int row = 0; row < 3; row++) { + for (int column = 0; column < 3; column++) { + toModel[column * 3 + row] = placement[row * 4 + column]; + } + } + + for (int nodeIndex : model.order) { + final GltfModel.Node node = model.nodes[nodeIndex]; + if (node.mesh < 0) continue; + final GltfModel.Mesh mesh = model.meshes[node.mesh]; + final GltfModel.Skin skin = node.skin >= 0 ? model.skins[node.skin] : null; + + // このノードの変換。陰影はモデルに固定なので、法線は配置の前の座標で求める + System.arraycopy(global, nodeIndex * 16, matrix2, 0, 16); + Mat4.multiply(placement, matrix2, matrix); + boolean flip = Mat4.determinant3(matrix) < 0; + Mat4.normalMatrix(matrix2, normal); + if (Mat4.determinant3(matrix2) < 0) negate(normal, 0); + + if (skin != null) { + // スキンのあるメッシュは、ノード自身の変換を使わない + flip = Mat4.determinant3(placement) < 0; + prepareJoints(skin, placement); + } + + for (int p = 0; p < mesh.primitives.length; p++) { + final GltfModel.Primitive primitive = mesh.primitives[p]; + final GltfModel.Material material = model.materials[primitive.material]; + final int group = groupIndex[node.mesh][p]; + transform(primitive, skin, weights[nodeIndex], material); + cursor[group] = write(primitive, material, flip, vertices[group], colors[group], cursor[group]); + } + } + } + + private static void negate(float[] array, int offset) { + for (int i = 0; i < 9; i++) array[offset + i] = -array[offset + i]; + } + + private void prepareJoints(GltfModel.Skin skin, float[] placement) { + final int count = skin.joints.length; + if (jointMatrices.length < count * 16) { + jointMatrices = new float[count * 16]; + jointNormals = new float[count * 9]; + } + final float[] inverseBind = new float[16]; + final float[] joint = new float[16]; + final float[] out = new float[16]; + final float[] bone = new float[16]; + final float[] boneNormal = new float[9]; + for (int j = 0; j < count; j++) { + if (skin.joints[j] < 0) { + System.arraycopy(Mat4.identity(), 0, bone, 0, 16); + } else { + System.arraycopy(global, skin.joints[j] * 16, joint, 0, 16); + System.arraycopy(skin.inverseBind, j * 16, inverseBind, 0, 16); + Mat4.multiply(joint, inverseBind, bone); + } + Mat4.multiply(placement, bone, out); + System.arraycopy(out, 0, jointMatrices, j * 16, 16); + Mat4.normalMatrix(bone, boneNormal); + // 余因子行列は裏返しの変換で向きが逆になるので、元に戻す + if (Mat4.determinant3(bone) < 0) negate(boneNormal, 0); + System.arraycopy(boneNormal, 0, jointNormals, j * 9, 9); + } + } + + // 頂点の位置と色を計算して positions, front, back に入れる + private void transform(GltfModel.Primitive primitive, GltfModel.Skin skin, float[] morph, GltfModel.Material material) { + final int count = primitive.vertexCount; + if (positions.length < count * 3) { + positions = new float[count * 3]; + front = new int[count]; + back = new int[count]; + } + final float[] sourcePositions = primitive.positions; + final float[] sourceNormals = primitive.normals; + final int targets = morph == null ? 0 : Math.min(morph.length, primitive.morphPositions.length); + final int influences = skin == null ? 0 : primitive.influences; + final float[] m = matrix; + final float[] n = normal; + + for (int i = 0; i < count; i++) { + float px = sourcePositions[i * 3], py = sourcePositions[i * 3 + 1], pz = sourcePositions[i * 3 + 2]; + float nx = 0, ny = 0, nz = 0; + if (sourceNormals != null) { + nx = sourceNormals[i * 3]; + ny = sourceNormals[i * 3 + 1]; + nz = sourceNormals[i * 3 + 2]; + } + for (int t = 0; t < targets; t++) { + final float weight = morph[t]; + if (weight == 0) continue; + final float[] deltaPositions = primitive.morphPositions[t]; + if (deltaPositions != null) { + px += deltaPositions[i * 3] * weight; + py += deltaPositions[i * 3 + 1] * weight; + pz += deltaPositions[i * 3 + 2] * weight; + } + final float[] deltaNormals = primitive.morphNormals[t]; + if (deltaNormals != null && sourceNormals != null) { + nx += deltaNormals[i * 3] * weight; + ny += deltaNormals[i * 3 + 1] * weight; + nz += deltaNormals[i * 3 + 2] * weight; + } + } + + float x, y, z, wnx, wny, wnz; + if (influences > 0) { + x = y = z = wnx = wny = wnz = 0; + for (int k = 0; k < influences; k++) { + final float weight = primitive.weights[i * influences + k]; + if (weight == 0) continue; + final int joint = primitive.joints[i * influences + k]; + if (joint < 0 || joint >= skin.joints.length) continue; + final int o = joint * 16; + final float[] jm = jointMatrices; + x += weight * (jm[o] * px + jm[o + 4] * py + jm[o + 8] * pz + jm[o + 12]); + y += weight * (jm[o + 1] * px + jm[o + 5] * py + jm[o + 9] * pz + jm[o + 13]); + z += weight * (jm[o + 2] * px + jm[o + 6] * py + jm[o + 10] * pz + jm[o + 14]); + final int q = joint * 9; + final float[] jn = jointNormals; + wnx += weight * (jn[q] * nx + jn[q + 3] * ny + jn[q + 6] * nz); + wny += weight * (jn[q + 1] * nx + jn[q + 4] * ny + jn[q + 7] * nz); + wnz += weight * (jn[q + 2] * nx + jn[q + 5] * ny + jn[q + 8] * nz); + } + } else { + x = m[0] * px + m[4] * py + m[8] * pz + m[12]; + y = m[1] * px + m[5] * py + m[9] * pz + m[13]; + z = m[2] * px + m[6] * py + m[10] * pz + m[14]; + wnx = n[0] * nx + n[3] * ny + n[6] * nz; + wny = n[1] * nx + n[4] * ny + n[7] * nz; + wnz = n[2] * nx + n[5] * ny + n[8] * nz; + } + positions[i * 3] = x; + positions[i * 3 + 1] = y; + positions[i * 3 + 2] = z; + + if (sourceNormals != null) { + final float length = (float) Math.sqrt(wnx * wnx + wny * wny + wnz * wnz); + if (length > 0) { + wnx /= length; + wny /= length; + wnz /= length; + } + front[i] = color(primitive, material, i, wnx, wny, wnz); + if (material.doubleSided) { + back[i] = color(primitive, material, i, -wnx, -wny, -wnz); + } + } + } + } + + // 頂点の色を計算する。n は面の外側を向いた法線 (モデルの座標) + private int color(GltfModel.Primitive primitive, GltfModel.Material material, int vertex, float nx, float ny, float nz) { + float r = material.color[0], g = material.color[1], b = material.color[2], a = material.color[3]; + if (!material.unlit) { + final int m = primitive.material * 3; + GltfLight.shade(materialColor[m], materialColor[m + 1], materialColor[m + 2], + material.metallic, material.roughness, nx, ny, nz, 1f, lit); + r = GltfLight.toDisplay(lit[0]) / 255f; + g = GltfLight.toDisplay(lit[1]) / 255f; + b = GltfLight.toDisplay(lit[2]) / 255f; + } + if (primitive.colors != null) { + r *= primitive.colors[vertex * 4]; + g *= primitive.colors[vertex * 4 + 1]; + b *= primitive.colors[vertex * 4 + 2]; + if (material.alphaMode != GltfModel.ALPHA_OPAQUE) a *= primitive.colors[vertex * 4 + 3]; + } + r += material.emissive[0]; + g += material.emissive[1]; + b += material.emissive[2]; + return (channel(a) << 24) | (channel(r) << 16) | (channel(g) << 8) | channel(b); + } + + private static int channel(float value) { + return Math.max(0, Math.min(255, Math.round(value * 255f))); + } + + // 三角形を四角形として書き出し、書き出したあとの頂点数を返す + private int write(GltfModel.Primitive primitive, GltfModel.Material material, boolean flip, + float[] vertices, int[] colors, int count) { + final int[] indices = primitive.indices; + final float[] uv = primitive.cornerUv; + final boolean smooth = primitive.normals != null; + final boolean doubleSided = material.doubleSided; + + for (int i = 0; i + 2 < indices.length; i += 3) { + // 変換で裏返っている場合は、頂点の順序を逆にして表を保つ + final int cornerA = i, cornerB = flip ? i + 2 : i + 1, cornerC = flip ? i + 1 : i + 2; + final int a = indices[cornerA], b = indices[cornerB], c = indices[cornerC]; + + int colorA, colorB, colorC, backA = 0, backB = 0, backC = 0; + if (smooth) { + colorA = front[a]; + colorB = front[b]; + colorC = front[c]; + if (doubleSided) { + backA = back[a]; + backB = back[b]; + backC = back[c]; + } + } else { + // 法線がないモデルは、面ごとに向きを求める + final float ax = positions[a * 3], ay = positions[a * 3 + 1], az = positions[a * 3 + 2]; + final float ux = positions[b * 3] - ax, uy = positions[b * 3 + 1] - ay, uz = positions[b * 3 + 2] - az; + final float wx = positions[c * 3] - ax, wy = positions[c * 3 + 1] - ay, wz = positions[c * 3 + 2] - az; + final float px = uy * wz - uz * wy, py = uz * wx - ux * wz, pz = ux * wy - uy * wx; + // 描画する座標で求めた向きを、モデルの座標に戻す + float nx = toModel[0] * px + toModel[3] * py + toModel[6] * pz; + float ny = toModel[1] * px + toModel[4] * py + toModel[7] * pz; + float nz = toModel[2] * px + toModel[5] * py + toModel[8] * pz; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) { + nx /= length; + ny /= length; + nz /= length; + } + colorA = color(primitive, material, a, nx, ny, nz); + colorB = color(primitive, material, b, nx, ny, nz); + colorC = color(primitive, material, c, nx, ny, nz); + if (doubleSided) { + backA = color(primitive, material, a, -nx, -ny, -nz); + backB = color(primitive, material, b, -nx, -ny, -nz); + backC = color(primitive, material, c, -nx, -ny, -nz); + } + } + + count = put(vertices, colors, count, a, cornerA, colorA, uv); + count = put(vertices, colors, count, b, cornerB, colorB, uv); + count = put(vertices, colors, count, c, cornerC, colorC, uv); + count = put(vertices, colors, count, c, cornerC, colorC, uv); + if (doubleSided) { + count = put(vertices, colors, count, a, cornerA, backA, uv); + count = put(vertices, colors, count, c, cornerC, backC, uv); + count = put(vertices, colors, count, b, cornerB, backB, uv); + count = put(vertices, colors, count, b, cornerB, backB, uv); + } + } + return count; + } + + private int put(float[] vertices, int[] colors, int count, int vertex, int corner, int color, float[] uv) { + final int o = count * STRIDE; + vertices[o] = positions[vertex * 3]; + vertices[o + 1] = positions[vertex * 3 + 1]; + vertices[o + 2] = positions[vertex * 3 + 2]; + vertices[o + 3] = uv[corner * 2]; + vertices[o + 4] = uv[corner * 2 + 1]; + colors[count] = color; + return count + 1; + } + + /** + * 最初の姿勢でモデルを囲む直方体 (モデルの座標)。minX, minY, minZ, maxX, maxY, maxZ の順。 + */ + public float[] restBounds() { + if (restBounds == null) restBounds = computeRestBounds(); + return restBounds; + } + + private float[] computeRestBounds() { + pose(0); + final float[][] vertices = new float[groups.length][]; + final int[][] colors = new int[groups.length][]; + for (int i = 0; i < groups.length; i++) { + vertices[i] = new float[groups[i].vertexCount * STRIDE]; + colors[i] = new int[groups[i].vertexCount]; + } + emit(Mat4.identity(), vertices, colors); + + final float[] box = {Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, + Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY}; + for (int i = 0; i < groups.length; i++) { + for (int v = 0; v < groups[i].vertexCount; v++) { + for (int axis = 0; axis < 3; axis++) { + final float value = vertices[i][v * STRIDE + axis]; + if (value < box[axis]) box[axis] = value; + if (value > box[axis + 3]) box[axis + 3] = value; + } + } + } + return box; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/gltf/Mat4.java b/core/src/main/java/marumasa/marumasa_sign/core/gltf/Mat4.java new file mode 100644 index 00000000..27242d4c --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/gltf/Mat4.java @@ -0,0 +1,108 @@ +package marumasa.marumasa_sign.core.gltf; + +/** + * 4x4 行列とクォータニオンの計算。行列は glTF と同じ列優先の float[16]。 + */ +final class Mat4 { + + private Mat4() { + } + + static float[] identity() { + return new float[]{1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}; + } + + // out = a * b。out は a, b と別の配列であること + static void multiply(float[] a, float[] b, float[] out) { + for (int column = 0; column < 4; column++) { + final float b0 = b[column * 4], b1 = b[column * 4 + 1], b2 = b[column * 4 + 2], b3 = b[column * 4 + 3]; + out[column * 4] = a[0] * b0 + a[4] * b1 + a[8] * b2 + a[12] * b3; + out[column * 4 + 1] = a[1] * b0 + a[5] * b1 + a[9] * b2 + a[13] * b3; + out[column * 4 + 2] = a[2] * b0 + a[6] * b1 + a[10] * b2 + a[14] * b3; + out[column * 4 + 3] = a[3] * b0 + a[7] * b1 + a[11] * b2 + a[15] * b3; + } + } + + // 平行移動 t、回転 r (クォータニオン x, y, z, w)、拡大 s から行列を作る + static void compose(float[] t, float[] r, float[] s, float[] out) { + final float x = r[0], y = r[1], z = r[2], w = r[3]; + final float xx = x * x, yy = y * y, zz = z * z; + final float xy = x * y, xz = x * z, yz = y * z; + final float wx = w * x, wy = w * y, wz = w * z; + out[0] = (1 - 2 * (yy + zz)) * s[0]; + out[1] = (2 * (xy + wz)) * s[0]; + out[2] = (2 * (xz - wy)) * s[0]; + out[3] = 0; + out[4] = (2 * (xy - wz)) * s[1]; + out[5] = (1 - 2 * (xx + zz)) * s[1]; + out[6] = (2 * (yz + wx)) * s[1]; + out[7] = 0; + out[8] = (2 * (xz + wy)) * s[2]; + out[9] = (2 * (yz - wx)) * s[2]; + out[10] = (1 - 2 * (xx + yy)) * s[2]; + out[11] = 0; + out[12] = t[0]; + out[13] = t[1]; + out[14] = t[2]; + out[15] = 1; + } + + // 2 つのクォータニオンを球面線形補間する + static void slerp(float[] a, int ai, float[] b, int bi, float t, float[] out) { + float bx = b[bi], by = b[bi + 1], bz = b[bi + 2], bw = b[bi + 3]; + float cos = a[ai] * bx + a[ai + 1] * by + a[ai + 2] * bz + a[ai + 3] * bw; + // 近いほうの向きを通るようにする + if (cos < 0) { + cos = -cos; + bx = -bx; + by = -by; + bz = -bz; + bw = -bw; + } + float wa, wb; + if (cos > 0.9995f) { + wa = 1 - t; + wb = t; + } else { + final double angle = Math.acos(cos); + final double sin = Math.sin(angle); + wa = (float) (Math.sin((1 - t) * angle) / sin); + wb = (float) (Math.sin(t * angle) / sin); + } + out[0] = a[ai] * wa + bx * wb; + out[1] = a[ai + 1] * wa + by * wb; + out[2] = a[ai + 2] * wa + bz * wb; + out[3] = a[ai + 3] * wa + bw * wb; + normalize4(out); + } + + // 左上 3x3 の行列式。負なら面の向きが裏返る + static float determinant3(float[] m) { + return m[0] * (m[5] * m[10] - m[9] * m[6]) + - m[4] * (m[1] * m[10] - m[9] * m[2]) + + m[8] * (m[1] * m[6] - m[5] * m[2]); + } + + // 法線を変換するための 3x3 行列 (左上 3x3 の余因子行列) を out[0..8] に列優先で入れる + static void normalMatrix(float[] m, float[] out) { + out[0] = m[5] * m[10] - m[6] * m[9]; + out[1] = m[6] * m[8] - m[4] * m[10]; + out[2] = m[4] * m[9] - m[5] * m[8]; + out[3] = m[2] * m[9] - m[1] * m[10]; + out[4] = m[0] * m[10] - m[2] * m[8]; + out[5] = m[1] * m[8] - m[0] * m[9]; + out[6] = m[1] * m[6] - m[2] * m[5]; + out[7] = m[2] * m[4] - m[0] * m[6]; + out[8] = m[0] * m[5] - m[1] * m[4]; + } + + static void normalize4(float[] q) { + final float length = (float) Math.sqrt(q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3]); + if (length > 0) { + q[0] /= length; + q[1] /= length; + q[2] /= length; + q[3] /= length; + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/image/DecodedImage.java b/core/src/main/java/marumasa/marumasa_sign/core/image/DecodedImage.java new file mode 100644 index 00000000..a64fb528 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/image/DecodedImage.java @@ -0,0 +1,28 @@ +package marumasa.marumasa_sign.core.image; + +/** + * デコード済みの画像。アニメーションでなければフレームは 1 つ。 + */ +public final class DecodedImage { + + public final int width; + public final int height; + // フレームごとの ARGB ピクセル + public final int[][] frames; + // フレームごとの表示時間 (ミリ秒) + public final int[] delays; + // 繰り返し回数 (0 は無限) + public final int repetitions; + + public DecodedImage(int width, int height, int[][] frames, int[] delays, int repetitions) { + this.width = width; + this.height = height; + this.frames = frames; + this.delays = delays; + this.repetitions = repetitions; + } + + public boolean isAnimated() { + return frames.length > 1; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/image/ImageLoader.java b/core/src/main/java/marumasa/marumasa_sign/core/image/ImageLoader.java new file mode 100644 index 00000000..f3ad9a2e --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/image/ImageLoader.java @@ -0,0 +1,310 @@ +package marumasa.marumasa_sign.core.image; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.anim.AnimationFrame; +import marumasa.marumasa_sign.core.anim.ApngDecoder; +import marumasa.marumasa_sign.core.anim.DecodedAnimation; +import marumasa.marumasa_sign.core.anim.GifDecoder; +import marumasa.marumasa_sign.core.gltf.GltfLoader; +import marumasa.marumasa_sign.core.gltf.GltfScene; +import marumasa.marumasa_sign.core.media.Ffmpeg; +import marumasa.marumasa_sign.core.net.Http; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLDecoder; +import java.nio.file.Files; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * URL から画像をダウンロードしてデコードする。 + */ +public final class ImageLoader { + + public interface Callback { + void onLoaded(DecodedImage image); + + // 3D モデルだったとき + void onModel(GltfScene scene); + + // 画像でも 3D モデルでもなかったとき。動画や音声として再生できるかもしれない + void onMedia(); + + void onFailed(); + } + + // 静止画の大きさの上限 + private static final int MAX_STATIC_SIZE = 4096; + // アニメーションの大きさとフレーム数の上限 + private static final int MAX_ANIMATION_SIZE = 2048; + private static final int MAX_ANIMATION_FRAMES = 512; + // 3D モデルの大きさの上限 (外部ファイルを含む) + public static final int MAX_MODEL_SIZE = 64 * 1024 * 1024; + + private static final class Request { + final String url; + final Callback callback; + + Request(String url, Callback callback) { + this.url = url; + this.callback = callback; + } + } + + private final Queue queue = new ConcurrentLinkedQueue(); + private final AtomicInteger activeDownloads = new AtomicInteger(0); + private final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactory() { + @Override + public Thread newThread(Runnable r) { + final Thread thread = new Thread(r); + thread.setDaemon(true); + thread.setName("MarumaSign-ImageLoader"); + return thread; + } + }); + + public void request(String url, Callback callback) { + queue.add(new Request(url, callback)); + } + + public boolean isBusy() { + return !queue.isEmpty() || activeDownloads.get() > 0; + } + + // 同時ロード数の上限まで、待っている画像の読み込みを始める + public void pump(int maxThreads) { + while (activeDownloads.get() < maxThreads) { + final Request request = queue.poll(); + if (request == null) break; + activeDownloads.incrementAndGet(); + executor.submit(new Runnable() { + @Override + public void run() { + try { + load(request); + } finally { + activeDownloads.decrementAndGet(); + } + } + }); + } + } + + private static void load(Request request) { + final String url = request.url; + MarumaSign.LOGGER.info("Start: " + url); + try { + // 先頭だけを読んで、画像でも 3D モデルでもなければ残りは読まない + final boolean[] image = new boolean[1]; + final byte[] content = Http.download(url, new Http.HeadCheck() { + @Override + public boolean accept(byte[] head, int length) { + image[0] = isSupportedImage(head, length); + return image[0] || GltfLoader.isGlb(head, length) || GltfLoader.looksLikeJson(head, length); + } + }, MAX_MODEL_SIZE); + if (content == null) { + // FFmpeg を探すのには時間がかかることがあるので、メインスレッドに渡す前にここで済ませておく + Ffmpeg.isAvailable(); + request.callback.onMedia(); + return; + } + if (image[0]) { + if (content.length > Http.MAX_SIZE) { + throw new IOException("Content size exceeds the limit of " + Http.MAX_SIZE + " bytes."); + } + request.callback.onLoaded(decode(content)); + return; + } + request.callback.onModel(model(url, content)); + } catch (Exception e) { + MarumaSign.LOGGER.info("Failure: " + url + " (" + e + ")"); + request.callback.onFailed(); + } catch (Throwable e) { + // 画像の内容が原因ではない、想定外の失敗。握りつぶさずに記録する + MarumaSign.LOGGER.error("Unexpected error while loading " + url, e); + request.callback.onFailed(); + } + } + + // 先頭のバイト列が 3D モデル (.glb / .gltf) らしいかどうか + public static boolean isModel(byte[] head, int length) { + return GltfLoader.isGlb(head, length) || GltfLoader.looksLikeJson(head, length); + } + + // URL からダウンロードした内容を 3D モデルとして読み込む + public static GltfScene model(String url, byte[] content) throws IOException { + return scene(content, new ModelResources(url, content.length)); + } + + // ファイルを 3D モデルとして読み込む + public static GltfScene model(File file) throws IOException { + if (file.length() > MAX_MODEL_SIZE) throw new IOException("Content size exceeds the limit of " + MAX_MODEL_SIZE + " bytes."); + return scene(Files.readAllBytes(file.toPath()), fileResources(file)); + } + + private static GltfScene scene(byte[] content, GltfLoader.Resources resources) throws IOException { + final GltfScene scene = new GltfScene(GltfLoader.load(content, resources)); + // 大きさの計算には時間がかかることがあるので、描画するスレッドに渡す前にここで済ませておく + scene.restBounds(); + return scene; + } + + // 3D モデルが参照している外部ファイルを、モデルのファイルと同じフォルダから読み込む + public static GltfLoader.Resources fileResources(final File file) { + return new GltfLoader.Resources() { + private long total = file.length(); + + @Override + public byte[] load(String uri) throws IOException { + final File target = new File(file.getAbsoluteFile().getParentFile(), URLDecoder.decode(uri, "UTF-8")); + total += target.length(); + if (total > MAX_MODEL_SIZE) throw new IOException("Content size exceeds the limit of " + MAX_MODEL_SIZE + " bytes."); + return Files.readAllBytes(target.toPath()); + } + }; + } + + // 3D モデルが参照している外部ファイル (バッファや画像) を、モデルの URL からの相対位置で読み込む + private static final class ModelResources implements GltfLoader.Resources { + private final URL base; + private long total; + + ModelResources(String url, long loaded) throws IOException { + this.base = new URL(url); + this.total = loaded; + } + + @Override + public byte[] load(String uri) throws IOException { + final URL resolved = new URL(base, uri); + final String protocol = resolved.getProtocol(); + if (!"http".equals(protocol) && !"https".equals(protocol)) { + throw new IOException("Unsupported resource location: " + uri); + } + // 全体の大きさを、モデル 1 つ分の上限に収める + final long remaining = MAX_MODEL_SIZE - total; + if (remaining <= 0) throw new IOException("Content size exceeds the limit of " + MAX_MODEL_SIZE + " bytes."); + final byte[] content = Http.download(resolved.toString(), null, (int) remaining); + total += content.length; + return content; + } + } + + public static DecodedImage decode(byte[] content) throws IOException { + if (content == null) throw new IOException("No content"); + + final DecodedAnimation animation; + if (isGif(content)) { + animation = GifDecoder.read(content); + } else if (isApng(content)) { + animation = ApngDecoder.read(content); + } else { + return decodeStatic(content); + } + + final int width = animation.getWidth(); + final int height = animation.getHeight(); + final List frames = animation.getFrames(); + final int count = frames.size(); + if (count == 0 || width <= 0 || height <= 0 + || width > MAX_ANIMATION_SIZE || height > MAX_ANIMATION_SIZE || count > MAX_ANIMATION_FRAMES) { + throw new IOException("Animation exceeds safety limits (max " + MAX_ANIMATION_SIZE + "x" + MAX_ANIMATION_SIZE + + ", " + MAX_ANIMATION_FRAMES + " frames)"); + } + + final int[][] pixels = new int[count][]; + final int[] delays = new int[count]; + for (int i = 0; i < count; i++) { + final AnimationFrame frame = frames.get(i); + pixels[i] = frame.getPixels(); + delays[i] = frame.getDelay(); + } + return new DecodedImage(width, height, pixels, delays, animation.getRepetitions()); + } + + private static DecodedImage decodeStatic(byte[] content) throws IOException { + final BufferedImage image; + try { + image = ImageIO.read(new ByteArrayInputStream(content)); + } catch (RuntimeException e) { + throw new IOException("Not an image", e); + } + if (image == null) throw new IOException("Not an image"); + return fromBufferedImage(image); + } + + public static DecodedImage fromBufferedImage(BufferedImage image) throws IOException { + final int width = image.getWidth(); + final int height = image.getHeight(); + if (width <= 0 || height <= 0 || width > MAX_STATIC_SIZE || height > MAX_STATIC_SIZE) { + throw new IOException("Image exceeds safety limits (max " + MAX_STATIC_SIZE + "x" + MAX_STATIC_SIZE + ")"); + } + final int[] pixels = image.getRGB(0, 0, width, height, null, 0, width); + return new DecodedImage(width, height, new int[][]{pixels}, new int[]{1}, 0); + } + + // jar に同梱されている画像を読み込む + public static DecodedImage readResource(String path) { + try { + final InputStream stream = ImageLoader.class.getResourceAsStream(path); + if (stream == null) throw new IOException("Resource not found: " + path); + try { + return fromBufferedImage(ImageIO.read(stream)); + } finally { + stream.close(); + } + } catch (IOException e) { + MarumaSign.LOGGER.error("Failed to load resource: " + path, e); + // 読めなかった場合は 1 ピクセルのマゼンタで代用する + return new DecodedImage(1, 1, new int[][]{{0xFFFF00FF}}, new int[]{1}, 0); + } + } + + // このクラスで読める形式 (PNG, GIF, JPEG, BMP) かどうかを、先頭のバイト列から判定する + public static boolean isSupportedImage(byte[] head, int length) { + if (length >= 8 && (head[0] & 0xFF) == 0x89 && head[1] == 'P' && head[2] == 'N' && head[3] == 'G') return true; + if (length >= 6 && head[0] == 'G' && head[1] == 'I' && head[2] == 'F' && head[3] == '8') return true; + if (length >= 3 && (head[0] & 0xFF) == 0xFF && (head[1] & 0xFF) == 0xD8 && (head[2] & 0xFF) == 0xFF) return true; + return length >= 2 && head[0] == 'B' && head[1] == 'M'; + } + + public static boolean isGif(byte[] bytes) { + if (bytes == null || bytes.length < 6) return false; + final String header = new String(bytes, 0, 6, StandardCharsets.US_ASCII); + return header.equals("GIF89a") || header.equals("GIF87a"); + } + + private static final byte[] PNG_SIGNATURE = {(byte) 137, 80, 78, 71, 13, 10, 26, 10}; + + public static boolean isApng(byte[] bytes) { + if (bytes == null || bytes.length < 8) return false; + for (int i = 0; i < 8; i++) { + if (bytes[i] != PNG_SIGNATURE[i]) return false; + } + int pos = 8; + while (pos + 8 <= bytes.length) { + final int length = ((bytes[pos] & 0xFF) << 24) | ((bytes[pos + 1] & 0xFF) << 16) + | ((bytes[pos + 2] & 0xFF) << 8) | (bytes[pos + 3] & 0xFF); + if (length < 0) break; + final String type = new String(bytes, pos + 4, 4, StandardCharsets.US_ASCII); + if (type.equals("acTL")) return true; + // 画像データより後ろに acTL が来ることはない + if (type.equals("IDAT")) return false; + pos += 8 + length + 4; + } + return false; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/media/Ffmpeg.java b/core/src/main/java/marumasa/marumasa_sign/core/media/Ffmpeg.java new file mode 100644 index 00000000..e962c3c6 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/media/Ffmpeg.java @@ -0,0 +1,107 @@ +package marumasa.marumasa_sign.core.media; + +import marumasa.marumasa_sign.core.MarumaSign; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.TimeUnit; + +/** + * 動画と音声の再生に使う FFmpeg の実行ファイルを探す。 + * 探す順番: システムプロパティ marumasign.ffmpeg、ゲームフォルダの marumasign/ffmpeg、PATH、よくあるインストール先。 + */ +public final class Ffmpeg { + + private static final boolean WINDOWS = System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win"); + + private static boolean searched; + private static File ffmpeg; + private static File ffprobe; + + private Ffmpeg() { + } + + // 再生に使える状態かどうか + public static synchronized boolean isAvailable() { + search(); + return ffmpeg != null && ffprobe != null; + } + + static synchronized File ffmpeg() { + search(); + return ffmpeg; + } + + static synchronized File ffprobe() { + search(); + return ffprobe; + } + + private static String executable(String name) { + return WINDOWS ? name + ".exe" : name; + } + + private static void search() { + if (searched) return; + searched = true; + + final List directories = new ArrayList(); + final String configured = System.getProperty("marumasign.ffmpeg"); + if (configured != null && !configured.isEmpty()) { + final File file = new File(configured); + directories.add(file.isDirectory() ? file : file.getParentFile()); + } + if (MarumaSign.platform() != null) { + directories.add(new File(MarumaSign.platform().gameDirectory(), "marumasign/ffmpeg")); + directories.add(new File(MarumaSign.platform().gameDirectory(), "marumasign/ffmpeg/bin")); + } + final String path = System.getenv("PATH"); + if (path != null) { + for (String entry : path.split(File.pathSeparator)) { + if (!entry.isEmpty()) directories.add(new File(entry)); + } + } + if (WINDOWS) { + directories.add(new File("C:\\ffmpeg\\bin")); + directories.add(new File(System.getenv("ProgramFiles") == null ? "C:\\Program Files" : System.getenv("ProgramFiles"), "ffmpeg\\bin")); + } else { + directories.add(new File("/opt/homebrew/bin")); + directories.add(new File("/usr/local/bin")); + directories.add(new File("/usr/bin")); + } + + for (File directory : directories) { + if (directory == null) continue; + final File candidate = new File(directory, executable("ffmpeg")); + final File probe = new File(directory, executable("ffprobe")); + if (candidate.isFile() && probe.isFile() && runs(candidate)) { + ffmpeg = candidate; + ffprobe = probe; + MarumaSign.LOGGER.info("FFmpeg found: " + candidate); + return; + } + } + MarumaSign.LOGGER.info("FFmpeg was not found. Videos and audio cannot be played."); + } + + // 実際に起動できるかどうかを確かめる + private static boolean runs(File executable) { + try { + final Process process = new ProcessBuilder(executable.getPath(), "-version") + .redirectErrorStream(true) + .redirectOutput(ProcessBuilder.Redirect.PIPE) + .start(); + process.getOutputStream().close(); + // 出力を読み捨てないと、止まってしまうことがある + final byte[] buffer = new byte[4096]; + while (process.getInputStream().read(buffer) >= 0) { + // 読み捨てる + } + return process.waitFor(10, TimeUnit.SECONDS) && process.exitValue() == 0; + } catch (Exception e) { + return false; + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/media/MediaInfo.java b/core/src/main/java/marumasa/marumasa_sign/core/media/MediaInfo.java new file mode 100644 index 00000000..019b1cee --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/media/MediaInfo.java @@ -0,0 +1,112 @@ +package marumasa.marumasa_sign.core.media; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +/** + * 動画や音声の情報。ffprobe で調べる。 + */ +final class MediaInfo { + + boolean hasVideo; + boolean hasAudio; + int width; + int height; + // 1 秒あたりのフレーム数。静止画なら 0 + double frameRate; + // 長さ (秒)。分からなければ 0 + double duration; + // 映像のフレーム数。分からなければ 0 + long frameCount; + + // 1 枚だけの画像かどうか + boolean isStillImage() { + return hasVideo && !hasAudio && (frameCount == 1 || (frameRate <= 0 && duration <= 0)); + } + + private static double parseRate(String value) { + try { + final int slash = value.indexOf('/'); + if (slash < 0) return Double.parseDouble(value); + final double denominator = Double.parseDouble(value.substring(slash + 1)); + return denominator == 0 ? 0 : Double.parseDouble(value.substring(0, slash)) / denominator; + } catch (NumberFormatException e) { + return 0; + } + } + + private static double parseNumber(String value) { + try { + return Double.parseDouble(value); + } catch (NumberFormatException e) { + return 0; + } + } + + static MediaInfo probe(String url) throws IOException { + // 結果を「項目=値」の形式で 1 行ずつ出力させる + final Process process = new ProcessBuilder(Arrays.asList( + Ffmpeg.ffprobe().getPath(), + "-v", "error", + "-protocol_whitelist", MediaPlayer.PROTOCOLS, + "-show_entries", "stream=codec_type,width,height,avg_frame_rate,r_frame_rate,nb_frames:format=duration", + "-of", "default=noprint_wrappers=1", + url + )).redirectErrorStream(false).start(); + process.getOutputStream().close(); + MediaPlayer.drain(process.getErrorStream(), null); + + final MediaInfo info = new MediaInfo(); + // いま読んでいるストリームの種類 + String type = ""; + boolean videoDone = false; + final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)); + try { + String line; + while ((line = reader.readLine()) != null) { + final int equals = line.indexOf('='); + if (equals < 0) continue; + final String key = line.substring(0, equals); + final String value = line.substring(equals + 1).trim(); + if (key.equals("codec_type")) { + // 2 本目以降の映像は使わない + if (type.equals("video")) videoDone = true; + type = value; + if (value.equals("video")) info.hasVideo = true; + if (value.equals("audio")) info.hasAudio = true; + } else if (key.equals("duration")) { + info.duration = parseNumber(value); + } else if (type.equals("video") && !videoDone) { + if (key.equals("width")) info.width = (int) parseNumber(value); + else if (key.equals("height")) info.height = (int) parseNumber(value); + else if (key.equals("nb_frames")) info.frameCount = (long) parseNumber(value); + else if (key.equals("avg_frame_rate") && parseRate(value) > 0) info.frameRate = parseRate(value); + else if (key.equals("r_frame_rate") && info.frameRate <= 0) info.frameRate = parseRate(value); + } + } + } finally { + reader.close(); + } + try { + if (!process.waitFor(30, TimeUnit.SECONDS)) { + process.destroyForcibly(); + throw new IOException("ffprobe timed out"); + } + } catch (InterruptedException e) { + process.destroyForcibly(); + Thread.currentThread().interrupt(); + throw new IOException("Interrupted"); + } + if (process.exitValue() != 0 || (!info.hasVideo && !info.hasAudio)) { + throw new IOException("Not a playable media"); + } + if (info.hasVideo && (info.width <= 0 || info.height <= 0)) { + throw new IOException("Unknown video size"); + } + return info; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/media/MediaPlayer.java b/core/src/main/java/marumasa/marumasa_sign/core/media/MediaPlayer.java new file mode 100644 index 00000000..42b64c7e --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/media/MediaPlayer.java @@ -0,0 +1,383 @@ +package marumasa.marumasa_sign.core.media; + +import marumasa.marumasa_sign.core.MarumaSign; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.DataLine; +import javax.sound.sampled.SourceDataLine; +import java.io.DataInputStream; +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.List; + +/** + * 動画や音声を 1 つ再生する。 + * FFmpeg を別のプロセスとして動かし、映像は生のフレームを、音声は PCM を、 + * どちらもこのコンピューター内の通信 (TCP) で受け取る。 + * 標準出力のパイプは OS のバッファが小さく、生の映像を流すには遅いため使わない。 + * どの形式を読めるか、GPU でデコードできるかは FFmpeg に任せている。 + */ +public final class MediaPlayer { + + // FFmpeg に許可する通信の種類。ローカルのファイルなどは読ませない + static final String PROTOCOLS = "http,https,tcp,tls,crypto,httpproxy"; + + // 映像の長辺の上限 (ピクセル)。これより大きい映像は縮小して受け取る + private static final int MAX_VIDEO_SIZE = 1280; + private static final double MAX_FRAME_RATE = 60.0; + + // 映像を受け取る通信の受信バッファ (バイト) + private static final int VIDEO_BUFFER_SIZE = 8 * 1024 * 1024; + + private static final int SAMPLE_RATE = 48000; + private static final int CHANNELS = 2; + private static final int BYTES_PER_SAMPLE_FRAME = CHANNELS * 2; + + public interface Listener { + // 映像の大きさなどが分かり、再生を始められるようになったとき。映像がなければ width, height は 0 + void onReady(int width, int height); + + void onFailed(String reason); + } + + private final String url; + private final Listener listener; + + private volatile boolean stopped; + private volatile Process process; + private volatile ServerSocket audioServer; + private volatile ServerSocket videoServer; + private volatile SourceDataLine line; + // 音量 (0 - 1) + private volatile float gain = 1f; + + private int width; + private int height; + + // 表示待ちのフレーム。映像のスレッドが書き、描画のスレッドが取り出す + private final Object frameLock = new Object(); + private int[] pendingFrame; + private boolean frameAvailable; + + // 時計: 音声があれば、実際に鳴った位置に映像を合わせる + private volatile boolean audioRunning; + private volatile long audioWrittenFrames; + private long startNanos; + + public MediaPlayer(String url, Listener listener) { + this.url = url; + this.listener = listener; + } + + public int width() { + return width; + } + + public int height() { + return height; + } + + public void setGain(float value) { + gain = Math.max(0f, Math.min(1f, value)); + } + + public void start() { + final Thread thread = new Thread(new Runnable() { + @Override + public void run() { + MediaPlayer.this.run(); + } + }, "MarumaSign-Media"); + thread.setDaemon(true); + thread.start(); + } + + public void stop() { + stopped = true; + final Process running = process; + if (running != null) running.destroyForcibly(); + for (ServerSocket server : new ServerSocket[]{audioServer, videoServer}) { + if (server == null) continue; + try { + server.close(); + } catch (IOException e) { + // 既に閉じている + } + } + final SourceDataLine openLine = line; + if (openLine != null) { + openLine.stop(); + openLine.close(); + } + } + + /** + * 新しいフレームがあれば dst に写して true を返す。描画のスレッドから呼ぶ。 + */ + public boolean pollFrame(int[] dst) { + synchronized (frameLock) { + if (!frameAvailable) return false; + System.arraycopy(pendingFrame, 0, dst, 0, Math.min(dst.length, pendingFrame.length)); + frameAvailable = false; + return true; + } + } + + private void run() { + boolean ready = false; + try { + final MediaInfo info = MediaInfo.probe(url); + if (stopped) return; + + double frameRate = 0; + if (info.hasVideo) { + // 大きすぎる映像は縮小する。幅と高さは偶数にそろえる + final double scale = Math.min(1.0, (double) MAX_VIDEO_SIZE / Math.max(info.width, info.height)); + width = Math.max(2, (int) Math.round(info.width * scale) & ~1); + height = Math.max(2, (int) Math.round(info.height * scale) & ~1); + frameRate = info.isStillImage() ? 0 : Math.min(MAX_FRAME_RATE, info.frameRate > 0 ? info.frameRate : 30.0); + synchronized (frameLock) { + pendingFrame = new int[width * height]; + } + } + listener.onReady(width, height); + ready = true; + play(info, frameRate); + } catch (Exception e) { + if (!stopped) { + MarumaSign.LOGGER.info("Media failure: " + url + " (" + e + ")"); + // 再生が始まったあとの失敗では、最後のフレームをそのまま残す + if (!ready) listener.onFailed(String.valueOf(e.getMessage())); + } + } catch (Throwable e) { + MarumaSign.LOGGER.error("Unexpected error while playing " + url, e); + if (!ready) listener.onFailed(String.valueOf(e)); + } finally { + stop(); + } + } + + private void play(MediaInfo info, double frameRate) throws IOException { + final List command = new ArrayList(); + command.add(Ffmpeg.ffmpeg().getPath()); + add(command, "-hide_banner", "-loglevel", "error", "-nostdin"); + add(command, "-protocol_whitelist", PROTOCOLS); + // 使える GPU のデコーダーがあれば使う + add(command, "-hwaccel", "auto"); + final boolean loop = frameRate > 0 || !info.hasVideo; + if (loop && info.duration > 0) add(command, "-stream_loop", "-1"); + add(command, "-i", url); + + if (info.hasVideo) { + String filter = "scale=" + width + ":" + height + ":flags=bilinear"; + if (frameRate > 0) filter += ",fps=" + frameRate; + add(command, "-map", "0:v:0", "-vf", filter); + if (frameRate <= 0) add(command, "-frames:v", "1"); + final ServerSocket server = new ServerSocket(); + // 1 フレームが数 MB あるので、受信バッファを大きくしておく + server.setReceiveBufferSize(VIDEO_BUFFER_SIZE); + server.bind(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 0), 1); + videoServer = server; + // リトルエンディアンの int として読むと ARGB になる並び + add(command, "-pix_fmt", "bgra", "-f", "rawvideo", "tcp://127.0.0.1:" + server.getLocalPort()); + } + if (info.hasAudio) { + final ServerSocket server = new ServerSocket(0, 1, InetAddress.getByName("127.0.0.1")); + audioServer = server; + add(command, "-map", "0:a:0", "-vn", "-ac", String.valueOf(CHANNELS), "-ar", String.valueOf(SAMPLE_RATE), + "-f", "s16le", "tcp://127.0.0.1:" + server.getLocalPort()); + startAudioThread(server); + } + + final Process started = new ProcessBuilder(command).redirectErrorStream(false).start(); + process = started; + started.getOutputStream().close(); + final StringBuilder errors = new StringBuilder(); + drain(started.getErrorStream(), errors); + startNanos = System.nanoTime(); + + drain(started.getInputStream(), null); + if (info.hasVideo) { + final Socket socket = videoServer.accept(); + try { + readFrames(socket.getInputStream(), frameRate); + } finally { + socket.close(); + } + } + try { + started.waitFor(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + if (!stopped && started.exitValue() != 0 && errors.length() > 0) { + throw new IOException(errors.toString().trim()); + } + } + + private static void add(List command, String... arguments) { + for (String argument : arguments) { + command.add(argument); + } + } + + // ---------- 映像 ---------- + + private void readFrames(InputStream stream, double frameRate) throws IOException { + final DataInputStream input = new DataInputStream(stream); + final byte[] bytes = new byte[width * height * 4]; + final ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN); + final int[] pixels = new int[width * height]; + final long frameMicros = frameRate > 0 ? (long) (1000000.0 / frameRate) : 0; + long lastShown = 0; + + for (long index = 0; !stopped; index++) { + try { + input.readFully(bytes); + } catch (EOFException e) { + return; + } + // 最初のフレームが届いた時点を再生の開始とする (それまでの時間は FFmpeg の準備にかかった時間) + if (index == 0) startNanos = System.nanoTime(); + if (frameMicros > 0) { + final long due = index * frameMicros; + // 表示する時刻まで待つ + long now; + while (!stopped && (now = clockMicros()) < due) { + sleep(Math.min(10, Math.max(1, (due - now) / 1000))); + } + // 遅れているフレームは飛ばす。ただし、長く止まって見えないように時々は表示する + if (clockMicros() > due + frameMicros * 2 && due - lastShown < 250000) continue; + lastShown = due; + } + buffer.clear(); + buffer.asIntBuffer().get(pixels); + synchronized (frameLock) { + System.arraycopy(pixels, 0, pendingFrame, 0, pixels.length); + frameAvailable = true; + } + } + } + + // 再生位置 (マイクロ秒) + private long clockMicros() { + final SourceDataLine open = line; + if (audioRunning && open != null) { + return open.getMicrosecondPosition(); + } + return (System.nanoTime() - startNanos) / 1000; + } + + private static void sleep(long millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + + // ---------- 音声 ---------- + + private void startAudioThread(final ServerSocket server) { + final Thread thread = new Thread(new Runnable() { + @Override + public void run() { + try { + final Socket socket = server.accept(); + try { + playAudio(socket.getInputStream()); + } finally { + socket.close(); + } + } catch (Exception e) { + if (!stopped) MarumaSign.LOGGER.info("Audio stopped: " + url + " (" + e + ")"); + } finally { + audioRunning = false; + } + } + }, "MarumaSign-Audio"); + thread.setDaemon(true); + thread.start(); + } + + private void playAudio(InputStream input) throws IOException { + final AudioFormat format = new AudioFormat(SAMPLE_RATE, 16, CHANNELS, true, false); + SourceDataLine open = null; + try { + open = (SourceDataLine) AudioSystem.getLine(new DataLine.Info(SourceDataLine.class, format)); + // 0.2 秒分のバッファ。小さいほど映像とのずれが少ない + open.open(format, SAMPLE_RATE * BYTES_PER_SAMPLE_FRAME / 5); + open.start(); + } catch (Exception e) { + // 音を出せない環境では、読み捨てて映像だけを再生する + MarumaSign.LOGGER.info("Audio output is not available (" + e + ")"); + open = null; + } + line = open; + audioRunning = open != null; + + final byte[] buffer = new byte[BYTES_PER_SAMPLE_FRAME * 2048]; + int filled = 0; + while (!stopped) { + final int read = input.read(buffer, filled, buffer.length - filled); + if (read < 0) break; + filled += read; + // 左右そろった単位でだけ書き込む + final int usable = filled - filled % BYTES_PER_SAMPLE_FRAME; + if (usable == 0) continue; + if (open != null) { + applyGain(buffer, usable, gain); + open.write(buffer, 0, usable); + audioWrittenFrames += usable / BYTES_PER_SAMPLE_FRAME; + } + System.arraycopy(buffer, usable, buffer, 0, filled - usable); + filled -= usable; + } + if (open != null && !stopped) open.drain(); + } + + private static void applyGain(byte[] buffer, int length, float gain) { + if (gain >= 0.999f) return; + for (int i = 0; i + 1 < length; i += 2) { + final int sample = (short) ((buffer[i] & 0xFF) | (buffer[i + 1] << 8)); + final int scaled = (int) (sample * gain); + buffer[i] = (byte) scaled; + buffer[i + 1] = (byte) (scaled >> 8); + } + } + + // ---------- 補助 ---------- + + // ストリームを最後まで読む。into があれば、内容の先頭を文字列として残す + static void drain(final InputStream stream, final StringBuilder into) { + final Thread thread = new Thread(new Runnable() { + @Override + public void run() { + final byte[] buffer = new byte[4096]; + try { + int read; + while ((read = stream.read(buffer)) >= 0) { + if (into != null && into.length() < 2000) { + synchronized (into) { + into.append(new String(buffer, 0, read, "UTF-8")); + } + } + } + } catch (IOException e) { + // プロセスが終了した + } + } + }, "MarumaSign-MediaDrain"); + thread.setDaemon(true); + thread.start(); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/media/MediaTools.java b/core/src/main/java/marumasa/marumasa_sign/core/media/MediaTools.java new file mode 100644 index 00000000..4e890714 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/media/MediaTools.java @@ -0,0 +1,115 @@ +package marumasa.marumasa_sign.core.media; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Locale; +import java.util.concurrent.TimeUnit; + +/** + * 画面で使う、動画や音声についての補助。 + */ +public final class MediaTools { + + // 動画や音声として扱う拡張子 (FFmpeg がないときの判定に使う) + private static final String[] MEDIA_EXTENSIONS = { + ".mp4", ".m4v", ".mov", ".mkv", ".webm", ".avi", ".flv", ".wmv", ".ts", ".m2ts", ".mpg", ".mpeg", ".3gp", ".ogv", + ".mp3", ".m4a", ".aac", ".wav", ".ogg", ".oga", ".opus", ".flac", ".wma", + ".webp", ".avif", ".heic", ".tif", ".tiff", + }; + + private MediaTools() { + } + + public static boolean hasMediaExtension(String name) { + final String lower = name.toLowerCase(Locale.ROOT); + for (String extension : MEDIA_EXTENSIONS) { + if (lower.endsWith(extension)) return true; + } + return false; + } + + /** + * 動画などから、プレビュー用の画像を 1 枚取り出す。 + * 利用者が自分で選んだファイルにも使うため、ローカルのファイルも読ませる。 + * + * @param source ファイルのパスまたは URL + * @return 取り出せなければ null (音声だけの場合など) + */ + public static BufferedImage thumbnail(String source) throws IOException { + if (!Ffmpeg.isAvailable()) return null; + final Process process = new ProcessBuilder(Arrays.asList( + Ffmpeg.ffmpeg().getPath(), + "-hide_banner", "-loglevel", "error", "-nostdin", + "-protocol_whitelist", "file," + MediaPlayer.PROTOCOLS, + "-i", source, + "-map", "0:v:0", "-frames:v", "1", + // 大きすぎる映像は縮小する + "-vf", "scale='min(640,iw)':-2", + "-f", "image2pipe", "-c:v", "png", "pipe:1" + )).redirectErrorStream(false).start(); + process.getOutputStream().close(); + MediaPlayer.drain(process.getErrorStream(), null); + + final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + final InputStream input = process.getInputStream(); + try { + final byte[] buffer = new byte[8192]; + int read; + while ((read = input.read(buffer)) >= 0) { + bytes.write(buffer, 0, read); + if (bytes.size() > 16 * 1024 * 1024) break; + } + } finally { + input.close(); + } + try { + if (!process.waitFor(30, TimeUnit.SECONDS)) process.destroyForcibly(); + } catch (InterruptedException e) { + process.destroyForcibly(); + Thread.currentThread().interrupt(); + } + if (bytes.size() == 0) return null; + return ImageIO.read(new ByteArrayInputStream(bytes.toByteArray())); + } + + // FFmpeg で再生できるファイルかどうか + public static boolean isPlayable(File file) { + if (!Ffmpeg.isAvailable()) return hasMediaExtension(file.getName()); + try { + final Process process = new ProcessBuilder(Arrays.asList( + Ffmpeg.ffprobe().getPath(), "-v", "error", + "-show_entries", "stream=codec_type", "-of", "default=noprint_wrappers=1", + file.getPath() + )).redirectErrorStream(true).start(); + process.getOutputStream().close(); + final ByteArrayOutputStream output = new ByteArrayOutputStream(); + final InputStream input = process.getInputStream(); + try { + final byte[] buffer = new byte[4096]; + int read; + while ((read = input.read(buffer)) >= 0) { + output.write(buffer, 0, read); + } + } finally { + input.close(); + } + if (!process.waitFor(30, TimeUnit.SECONDS)) { + process.destroyForcibly(); + return false; + } + final String text = output.toString("UTF-8"); + return process.exitValue() == 0 && (text.contains("codec_type=video") || text.contains("codec_type=audio")); + } catch (IOException e) { + return false; + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return false; + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/net/Http.java b/core/src/main/java/marumasa/marumasa_sign/core/net/Http.java new file mode 100644 index 00000000..9419202d --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/net/Http.java @@ -0,0 +1,235 @@ +package marumasa.marumasa_sign.core.net; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + +/** + * 画像のダウンロード・アップロードと URL の短縮。 + */ +public final class Http { + + // ダウンロード・アップロードするファイルの大きさの上限 (10MB) + public static final int MAX_SIZE = 10 * 1024 * 1024; + // アップロードできるファイルの大きさの上限 (アップロード先の上限と同じ 200MB) + public static final long MAX_UPLOAD_SIZE = 200L * 1024 * 1024; + + private static final String USER_AGENT = "Mozilla/5.0 (MarumaSign)"; + + // 接続先。動作確認のときだけシステムプロパティで差し替える + private static String uploadEndpoint() { + return System.getProperty("marumasign.uploadUrl", "https://catbox.moe/user/api.php"); + } + + // URL 短縮サービス。先頭から順に試し、最初に成功したものを使う。 + // どれも「URL を付けて GET すると、短縮した URL だけが本文で返る」形式 + private static final String[] SHORTENERS = { + "https://is.gd/create.php?format=simple&url=", + "https://v.gd/create.php?format=simple&url=", + "https://tinyurl.com/api-create.php?url=", + "https://da.gd/s?url=", + }; + + private static String[] shorteners() { + final String override = System.getProperty("marumasign.shortenUrl"); + return override == null ? SHORTENERS : new String[]{override + "?format=simple&url="}; + } + + private Http() { + } + + public static boolean isHttpUrl(String text) { + return text != null && (text.startsWith("http://") || text.startsWith("https://")); + } + + private static HttpURLConnection open(String url) throws IOException { + if (!isHttpUrl(url)) throw new IOException("Unsupported protocol scheme in URL: " + url); + final String encoded; + try { + encoded = new URI(url).toASCIIString(); + } catch (URISyntaxException e) { + throw new IOException("Invalid URL: " + url); + } + final HttpURLConnection connection = (HttpURLConnection) new URL(encoded).openConnection(); + connection.setConnectTimeout(5000); + connection.setReadTimeout(10000); + connection.setRequestProperty("User-Agent", USER_AGENT); + return connection; + } + + // 先頭の最大 count バイトを読む + private static byte[] readHead(InputStream input, int count) throws IOException { + final byte[] buffer = new byte[count]; + int filled = 0; + while (filled < count) { + final int read = input.read(buffer, filled, count - filled); + if (read < 0) break; + filled += read; + } + return filled == count ? buffer : java.util.Arrays.copyOf(buffer, filled); + } + + private static byte[] readLimited(InputStream input, int limit) throws IOException { + final ByteArrayOutputStream output = new ByteArrayOutputStream(); + final byte[] buffer = new byte[8192]; + int total = 0; + int len; + while ((len = input.read(buffer)) != -1) { + total += len; + if (total > limit) throw new IOException("Content size exceeds the limit of " + limit + " bytes."); + output.write(buffer, 0, len); + } + return output.toByteArray(); + } + + // ダウンロードの途中で、先頭のバイト列を見て続けるかどうかを決める + public interface HeadCheck { + boolean accept(byte[] head, int length); + } + + public static byte[] download(String url) throws IOException { + return download(url, null); + } + + /** + * URL の内容をダウンロードする。 + * check が先頭のバイト列を受け付けなかった場合は、残りを読まずに null を返す。 + */ + public static byte[] download(String url, HeadCheck check) throws IOException { + return download(url, check, MAX_SIZE); + } + + // maxSize はダウンロードする大きさの上限 (バイト) + public static byte[] download(String url, HeadCheck check, int maxSize) throws IOException { + final HttpURLConnection connection = open(url); + try { + connection.setRequestMethod("GET"); + connection.setRequestProperty("Accept", "image/png, image/gif, image/jpeg, */*;q=0.5"); + connection.connect(); + + final int status = connection.getResponseCode(); + if (status / 100 != 2) throw new IOException("HTTP " + status); + final InputStream input = connection.getInputStream(); + try { + byte[] head = new byte[0]; + if (check != null) { + head = readHead(input, 16); + if (!check.accept(head, head.length)) return null; + } + if (connection.getContentLength() > maxSize) { + throw new IOException("Content size exceeds the limit of " + maxSize + " bytes."); + } + final byte[] rest = readLimited(input, maxSize - head.length); + if (head.length == 0) return rest; + final byte[] all = new byte[head.length + rest.length]; + System.arraycopy(head, 0, all, 0, head.length); + System.arraycopy(rest, 0, all, head.length, rest.length); + return all; + } finally { + input.close(); + } + } finally { + connection.disconnect(); + } + } + + private static String readText(HttpURLConnection connection) throws IOException { + final int status = connection.getResponseCode(); + final InputStream input = status / 100 == 2 ? connection.getInputStream() : connection.getErrorStream(); + if (input == null) throw new IOException("HTTP " + status); + final String body; + try { + body = new String(readLimited(input, 65536), StandardCharsets.UTF_8).trim(); + } finally { + input.close(); + } + if (status / 100 != 2) throw new IOException("HTTP " + status + ": " + body); + return body; + } + + // ファイルをアップロードして、その URL を返す。大きなファイルでもメモリに載せずに送る + public static String upload(File file) throws IOException { + final long size = file.length(); + if (size > MAX_UPLOAD_SIZE) throw new IOException("File size exceeds the limit of " + MAX_UPLOAD_SIZE + " bytes."); + final String safeName = file.getName().replace("\"", "").replace("\r", "").replace("\n", ""); + final String boundary = "----MarumaSign" + Long.toHexString(System.nanoTime()); + final String crlf = "\r\n"; + + final byte[] head = ("--" + boundary + crlf + + "Content-Disposition: form-data; name=\"reqtype\"" + crlf + crlf + + "fileupload" + crlf + + "--" + boundary + crlf + + "Content-Disposition: form-data; name=\"fileToUpload\"; filename=\"" + safeName + "\"" + crlf + + "Content-Type: application/octet-stream" + crlf + crlf).getBytes(StandardCharsets.UTF_8); + final byte[] tail = (crlf + "--" + boundary + "--" + crlf).getBytes(StandardCharsets.UTF_8); + + final HttpURLConnection connection = open(uploadEndpoint()); + try { + connection.setReadTimeout(120000); + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary); + connection.setFixedLengthStreamingMode(head.length + size + tail.length); + final OutputStream output = connection.getOutputStream(); + try { + output.write(head); + final InputStream input = new FileInputStream(file); + try { + final byte[] buffer = new byte[65536]; + int read; + while ((read = input.read(buffer)) >= 0) { + output.write(buffer, 0, read); + } + } finally { + input.close(); + } + output.write(tail); + } finally { + output.close(); + } + final String result = readText(connection); + if (!isHttpUrl(result)) throw new IOException("Unexpected response: " + result); + return result; + } finally { + connection.disconnect(); + } + } + + // URL を短縮する + public static String shorten(String url) throws IOException { + IOException failure = null; + for (String service : shorteners()) { + try { + return shorten(service, url); + } catch (IOException e) { + // 次のサービスを試す + failure = e; + } + } + throw failure != null ? failure : new IOException("No URL shortener is available"); + } + + private static String shorten(String service, String url) throws IOException { + final HttpURLConnection connection = open(service + URLEncoder.encode(url, "UTF-8")); + try { + connection.setRequestMethod("GET"); + final String result = readText(connection); + // 改行や空白を含むものは URL ではなくエラーメッセージ + if (!isHttpUrl(result) || result.length() > 64 || result.indexOf(' ') >= 0 || result.indexOf('\n') >= 0) { + throw new IOException("Unexpected response: " + result); + } + return result; + } finally { + connection.disconnect(); + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/sign/MediaSession.java b/core/src/main/java/marumasa/marumasa_sign/core/sign/MediaSession.java new file mode 100644 index 00000000..f6206a3c --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/sign/MediaSession.java @@ -0,0 +1,138 @@ +package marumasa.marumasa_sign.core.sign; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.Platform; +import marumasa.marumasa_sign.core.media.MediaPlayer; + +/** + * 看板に表示する動画や音声 1 つ分の再生。 + * 誰も見ていない間は再生を止め、また見えるようになったら最初から再生し直す。 + * メインスレッドからのみ使う。 + */ +final class MediaSession { + + // この時間 (ミリ秒) 描画されなければ再生を止める + private static final long IDLE_MILLIS = 3000; + // 音が聞こえる距離の上限 (ブロック) + private static final double HEARING_DISTANCE = 32.0; + + interface Listener { + // 映像の大きさが分かったとき。映像がなければ width, height は 0 + void onReady(int width, int height); + + void onFailed(); + } + + private final Platform platform; + private final String url; + private final Listener listener; + + private MediaPlayer player; + private boolean ready; + private boolean failed; + private long lastUsed = System.currentTimeMillis(); + + // 映像を貼るテクスチャと、その内容を受け取るための配列 + private Object texture; + private int width; + private int height; + private int[] pixels; + + // この tick の間に描画された看板のうち、最も近いものまでの距離 + private double nearestDistance = Double.MAX_VALUE; + + MediaSession(Platform platform, String url, Listener listener) { + this.platform = platform; + this.url = url; + this.listener = listener; + } + + void start() { + if (player != null || failed) return; + final MediaPlayer started = new MediaPlayer(url, new MediaPlayer.Listener() { + @Override + public void onReady(final int videoWidth, final int videoHeight) { + platform.execute(new Runnable() { + @Override + public void run() { + ready(videoWidth, videoHeight); + } + }); + } + + @Override + public void onFailed(String reason) { + platform.execute(new Runnable() { + @Override + public void run() { + failed = true; + if (!ready) listener.onFailed(); + } + }); + } + }); + player = started; + started.setGain(0f); + started.start(); + } + + private void ready(int videoWidth, int videoHeight) { + // 再開したときは、前と同じ大きさならテクスチャをそのまま使う + if (ready && videoWidth == width && videoHeight == height) return; + width = videoWidth; + height = videoHeight; + if (videoWidth > 0) { + MarumaSign.releaseTexture(platform, texture); + pixels = new int[videoWidth * videoHeight]; + texture = platform.createTexture(videoWidth, videoHeight, pixels); + } + ready = true; + listener.onReady(videoWidth, videoHeight); + } + + // 映像を貼るテクスチャ。映像がなければ null + Object texture() { + return texture; + } + + /** + * 描画のたびに呼ぶ。止まっていれば再生を再開し、新しいフレームがあればテクスチャに反映する。 + */ + void use(double distance) { + lastUsed = System.currentTimeMillis(); + if (distance < nearestDistance) nearestDistance = distance; + if (player == null) { + start(); + return; + } + if (texture != null && player.pollFrame(pixels)) { + platform.updateTexture(texture, width, height, pixels); + } + } + + // tick ごとに呼ぶ + void tick() { + if (player == null) return; + if (System.currentTimeMillis() - lastUsed > IDLE_MILLIS) { + player.stop(); + player = null; + return; + } + // 近いほど大きく聞こえるようにする + final double distance = nearestDistance == Double.MAX_VALUE ? 0 : nearestDistance; + final double falloff = Math.max(0.0, 1.0 - distance / HEARING_DISTANCE); + player.setGain((float) (falloff * falloff * MarumaSign.config().getVolume() / 100.0)); + nearestDistance = Double.MAX_VALUE; + } + + void close() { + if (player != null) { + player.stop(); + player = null; + } + if (texture != null) { + MarumaSign.releaseTexture(platform, texture); + texture = null; + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/sign/SignImage.java b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignImage.java new file mode 100644 index 00000000..682f86d2 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignImage.java @@ -0,0 +1,437 @@ +package marumasa.marumasa_sign.core.sign; + +import marumasa.marumasa_sign.core.gltf.GltfScene; + +/** + * 看板 1 種類 (文字列 1 つ) に対応する、表示する画像や 3D モデルと、その形。 + * 描画に必要な座標計算はすべてここで行い、各バージョンの実装は頂点を並べるだけにする。 + */ +public final class SignImage { + + /** + * 同じテクスチャで描く四角形のまとまり。 + * 頂点は 4 つで 1 枚。三角形は 3 つ目の頂点を重ねた四角形になっている。 + */ + public static final class Batch { + // vertices の 1 頂点あたりの要素数: x, y, z, u, v + public static final int STRIDE = 5; + + public Object texture; + // ブロックの角を原点とした座標 + public float[] vertices; + // 頂点ごとの色 (ARGB)。null ならすべて白 + public int[] colors; + public int vertexCount; + // vertices と colors の内容が変わるたびに増える。描画用のバッファを作り直すかどうかの判断に使う + public int revision; + // 半透明の面かどうか。半透明の面は、奥行きを記録せずに描くと重なりが自然になる + public boolean blend; + } + + // mesh() の 1 頂点あたりの要素数: x, y, z, u, v, nx, ny, nz + public static final int STRIDE = 8; + // 表と裏で 4 頂点ずつ + public static final int VERTEX_COUNT = 8; + + private static final float WALL_OFFSET = 0.4375f * 2; + private static final float FACE_OFFSET = 0.005f; + // 3D モデルのアニメーションを計算する細かさ (1 秒あたりの回数) + private static final float MODEL_FRAME_RATE = 60f; + // 向きの数。立て看板: 0-15, 壁掛け看板: 16-19 + private static final int ORIENTATIONS = 20; + // アイテムとして描くときの計算結果を入れる場所 + private static final int ITEM = ORIENTATIONS; + + // 3D モデルの、看板の向きごとの計算結果 + private static final class ModelCache { + final float[] placement = new float[16]; + float[][] vertices; + int[][] colors; + Batch[] batches; + int frame = -1; + } + + public final SignSpec spec; + private final TextureEntry texture; + + private int builtRevision = -1; + // 看板の向きに回転する前の 4 頂点 (x, y, z) + private final float[] base = new float[12]; + private double viewDistance; + // 看板の向きごとのメッシュ + private final float[][] meshes = new float[ORIENTATIONS][]; + private final float[][] bounds = new float[ORIENTATIONS][]; + private final Batch[][] imageBatches = new Batch[ORIENTATIONS + 1][]; + private final ModelCache[] modelCaches = new ModelCache[ORIENTATIONS + 1]; + + // 3D モデルを看板の大きさに合わせるための値 + private GltfScene model; + private float modelCenterX, modelCenterY, modelCenterZ; + private float modelFit; + private float modelDepth; + private final float[] point = new float[3]; + + SignImage(SignSpec spec, TextureEntry texture) { + this.spec = spec; + this.texture = texture; + } + + public TextureEntry textureEntry() { + return texture; + } + + // 現在表示するべきテクスチャ。描画のたびに呼ぶ + public Object texture() { + return texture.current(0); + } + + /** + * 現在表示するべきテクスチャ。描画のたびに呼ぶ。 + * + * @param distance カメラから看板までの距離 (ブロック)。動画や音声の音量に使う + */ + public Object texture(double distance) { + return texture.current(distance); + } + + // 読み込みが完了した画像を表示しているかどうか + public boolean isLoaded() { + return texture.state() == TextureEntry.LOADED; + } + + // 描画する距離の上限 + public double viewDistance() { + ensureBuilt(); + return viewDistance; + } + + private void ensureBuilt() { + final int revision = texture.revision(); + if (builtRevision == revision) return; + + model = texture.model(); + double maxDistSqr = 0; + if (model == null) { + final int width = texture.width(); + final int height = texture.height(); + float max = Math.max(width, height); + if (max <= 0) max = 1; + final float vx = width / max * spec.scaleX; + final float vy = height / max * spec.scaleY; + + rotate(-vx, -vy, 0, base, 0); + rotate(-vx, +vy, 0, base, 3); + rotate(+vx, +vy, 0, base, 6); + rotate(+vx, -vy, 0, base, 9); + for (int i = 0; i < 4; i++) { + final float x = base[i * 3], y = base[i * 3 + 1], z = base[i * 3 + 2]; + maxDistSqr = Math.max(maxDistSqr, x * x + y * y + z * z); + } + } else { + // モデルを囲む直方体の最も長い辺が、画像の長い辺と同じ大きさになるようにする + final float[] box = model.restBounds(); + modelCenterX = (box[0] + box[3]) / 2; + modelCenterY = (box[1] + box[4]) / 2; + modelCenterZ = (box[2] + box[5]) / 2; + final float extent = Math.max(box[3] - box[0], Math.max(box[4] - box[1], box[5] - box[2])); + modelFit = extent > 0 ? 2f / extent : 1f; + modelDepth = (box[5] - box[2]) / 2 * modelFit * Math.abs(spec.scaleX); + for (int corner = 0; corner < 8; corner++) { + local(box[(corner & 1) * 3], box[1 + ((corner >> 1) & 1) * 3], box[2 + ((corner >> 2) & 1) * 3], point); + maxDistSqr = Math.max(maxDistSqr, point[0] * point[0] + point[1] * point[1] + point[2] * point[2]); + } + } + viewDistance = Math.min(512.0, 64.0 + Math.sqrt(maxDistSqr) * 2.0); + + for (int i = 0; i < ORIENTATIONS; i++) { + meshes[i] = null; + bounds[i] = null; + } + for (int i = 0; i <= ORIENTATIONS; i++) { + imageBatches[i] = null; + modelCaches[i] = null; + } + builtRevision = revision; + } + + // 看板で指定された回転と移動を行い、out[offset..] に x, y, z を入れる + private void rotate(float x, float y, float z, float[] out, int offset) { + // X 軸回転 + double a = Math.toRadians(spec.pitch); + double sin = Math.sin(a), cos = Math.cos(a); + float ty = (float) (y * cos - z * sin); + float tz = (float) (y * sin + z * cos); + y = ty; + z = tz; + + // Y 軸回転 + a = Math.toRadians(-spec.yaw); + sin = Math.sin(a); + cos = Math.cos(a); + float tx = (float) (x * cos + z * sin); + tz = (float) (-x * sin + z * cos); + x = tx; + z = tz; + + // Z 軸回転 + a = Math.toRadians(-spec.roll); + sin = Math.sin(a); + cos = Math.cos(a); + tx = (float) (x * cos - y * sin); + ty = (float) (x * sin + y * cos); + x = tx; + y = ty; + + out[offset] = x + spec.x * 2; + out[offset + 1] = y + spec.y * 2; + out[offset + 2] = z + spec.z * 2; + } + + // モデルの座標を、看板の向きに回転する前の座標にする + private void local(float x, float y, float z, float[] out) { + // モデルの正面 (+Z) が看板の正面を向くように、縦の軸で半回転させる + rotate(-(x - modelCenterX) * modelFit * spec.scaleX, + (y - modelCenterY) * modelFit * spec.scaleY, + -(z - modelCenterZ) * modelFit * spec.scaleX, out, 0); + } + + // モデルの座標を、ブロックの角を原点とした座標にする + private void place(float x, float y, float z, float signYaw, boolean wall, float[] out) { + local(x, y, z, out); + // 壁掛け看板では、モデルの背面が壁に付くようにする + final float moveZ = wall ? WALL_OFFSET - modelDepth : 0f; + final double angle = Math.toRadians(-signYaw - 180); + final float sin = (float) Math.sin(angle); + final float cos = (float) Math.cos(angle); + final float px = out[0], pz = out[2] + moveZ; + out[0] = (px * cos + pz * sin) * 0.5f + 0.5f; + out[1] = out[1] * 0.5f + 0.5f; + out[2] = (-px * sin + pz * cos) * 0.5f + 0.5f; + } + + private static int meshIndex(float signYaw, boolean wall) { + if (wall) return 16 + (Math.round(signYaw / 90f) & 3); + return Math.round(signYaw / 22.5f) & 15; + } + + /** + * 描画する四角形を返す。描画のたびに呼ぶ。 + * + * @param signYaw 看板の向き (度)。立て看板は rotation * 22.5、壁掛け看板は向いている方角の角度 + * @param wall 壁掛け看板かどうか + * @param distance カメラから看板までの距離 (ブロック)。動画や音声の音量に使う + */ + public Batch[] batches(float signYaw, boolean wall, double distance) { + ensureBuilt(); + final int index = meshIndex(signYaw, wall); + if (model != null) return modelBatches(index, signYaw, wall); + + Batch[] batches = imageBatches[index]; + if (batches == null) { + final float[] mesh = mesh(signYaw, wall); + final Batch batch = new Batch(); + batch.vertexCount = VERTEX_COUNT; + batch.vertices = new float[VERTEX_COUNT * Batch.STRIDE]; + for (int i = 0; i < VERTEX_COUNT; i++) { + System.arraycopy(mesh, i * STRIDE, batch.vertices, i * Batch.STRIDE, Batch.STRIDE); + } + batches = new Batch[]{batch}; + imageBatches[index] = batches; + } + batches[0].texture = texture.current(distance); + return batches; + } + + /** + * アイテムとして描くときの四角形を返す。描画のたびに呼ぶ。 + * 一辺が 1 の立方体 (0 - 1) の中央に収まる大きさで、正面は +Z を向く。 + * 看板に書かれた位置・大きさ・回転は使わない。 + * + * @param distance カメラからアイテムまでの距離 (ブロック)。動画や音声の音量に使う + */ + public Batch[] itemBatches(double distance) { + ensureBuilt(); + if (model != null) return modelBatches(ITEM, 0, false); + + Batch[] batches = imageBatches[ITEM]; + if (batches == null) { + float max = Math.max(texture.width(), texture.height()); + if (max <= 0) max = 1; + final float x = texture.width() / max * 0.5f, y = texture.height() / max * 0.5f; + final Batch batch = new Batch(); + batch.vertexCount = VERTEX_COUNT; + batch.vertices = new float[]{ + // 表 (+Z 側から見える) + 0.5f - x, 0.5f - y, 0.5f, 0, 1, + 0.5f + x, 0.5f - y, 0.5f, 1, 1, + 0.5f + x, 0.5f + y, 0.5f, 1, 0, + 0.5f - x, 0.5f + y, 0.5f, 0, 0, + // 裏 + 0.5f - x, 0.5f - y, 0.5f, 0, 1, + 0.5f - x, 0.5f + y, 0.5f, 0, 0, + 0.5f + x, 0.5f + y, 0.5f, 1, 0, + 0.5f + x, 0.5f - y, 0.5f, 1, 1, + }; + batches = new Batch[]{batch}; + imageBatches[ITEM] = batches; + } + batches[0].texture = texture.current(distance); + return batches; + } + + private Batch[] modelBatches(int index, float signYaw, boolean wall) { + ModelCache cache = modelCaches[index]; + if (cache == null) { + cache = new ModelCache(); + if (index == ITEM) { + // 立方体の中央に、収まる大きさで置く + final float size = modelFit / 2; + cache.placement[0] = cache.placement[5] = cache.placement[10] = size; + cache.placement[12] = 0.5f - modelCenterX * size; + cache.placement[13] = 0.5f - modelCenterY * size; + cache.placement[14] = 0.5f - modelCenterZ * size; + cache.placement[15] = 1; + } else { + // 変換は平行移動と線形変換の組み合わせなので、原点と各軸の行き先から行列を作る + final float[] origin = new float[3]; + place(0, 0, 0, signYaw, wall, origin); + for (int axis = 0; axis < 3; axis++) { + place(axis == 0 ? 1 : 0, axis == 1 ? 1 : 0, axis == 2 ? 1 : 0, signYaw, wall, point); + cache.placement[axis * 4] = point[0] - origin[0]; + cache.placement[axis * 4 + 1] = point[1] - origin[1]; + cache.placement[axis * 4 + 2] = point[2] - origin[2]; + } + cache.placement[12] = origin[0]; + cache.placement[13] = origin[1]; + cache.placement[14] = origin[2]; + cache.placement[15] = 1; + } + + + final GltfScene.Group[] groups = model.groups(); + cache.vertices = new float[groups.length][]; + cache.colors = new int[groups.length][]; + cache.batches = new Batch[groups.length]; + for (int i = 0; i < groups.length; i++) { + final Batch batch = new Batch(); + batch.vertexCount = groups[i].vertexCount(); + batch.vertices = cache.vertices[i] = new float[batch.vertexCount * Batch.STRIDE]; + batch.colors = cache.colors[i] = new int[batch.vertexCount]; + batch.texture = texture.modelTexture(groups[i].texture); + batch.blend = groups[i].blend; + cache.batches[i] = batch; + } + modelCaches[index] = cache; + } + + // 動かないモデルは 1 回だけ計算する + final int frame = model.isAnimated() ? (int) (texture.modelTime() * MODEL_FRAME_RATE) : 0; + if (cache.frame != frame) { + model.pose(frame / MODEL_FRAME_RATE); + model.emit(cache.placement, cache.vertices, cache.colors); + cache.frame = frame; + for (Batch batch : cache.batches) batch.revision++; + } + return cache.batches; + } + + /** + * ブロックの角を原点とした座標での、画像の頂点列を返す。 + * 表 4 頂点、裏 4 頂点の順で、1 頂点は x, y, z, u, v, nx, ny, nz。 + * + * @param signYaw 看板の向き (度)。立て看板は rotation * 22.5、壁掛け看板は向いている方角の角度 + * @param wall 壁掛け看板かどうか + */ + public float[] mesh(float signYaw, boolean wall) { + ensureBuilt(); + final int index = meshIndex(signYaw, wall); + float[] mesh = meshes[index]; + if (mesh == null) { + mesh = buildMesh(signYaw, wall); + meshes[index] = mesh; + } + return mesh; + } + + /** + * ブロックの角を原点とした、画像や 3D モデルを囲む直方体。 + * minX, minY, minZ, maxX, maxY, maxZ の順。 + */ + public float[] bounds(float signYaw, boolean wall) { + ensureBuilt(); + final int index = meshIndex(signYaw, wall); + float[] box = bounds[index]; + if (box != null) return box; + + box = new float[]{ + Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, + Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY + }; + if (model == null) { + final float[] mesh = mesh(signYaw, wall); + for (int i = 0; i < VERTEX_COUNT; i++) { + extend(box, mesh[i * STRIDE], mesh[i * STRIDE + 1], mesh[i * STRIDE + 2]); + } + } else { + final float[] rest = model.restBounds(); + for (int corner = 0; corner < 8; corner++) { + place(rest[(corner & 1) * 3], rest[1 + ((corner >> 1) & 1) * 3], rest[2 + ((corner >> 2) & 1) * 3], + signYaw, wall, point); + extend(box, point[0], point[1], point[2]); + } + if (model.isAnimated()) { + // 動きで最初の姿勢からはみ出す分の余裕を持たせる + for (int axis = 0; axis < 3; axis++) { + final float margin = (box[axis + 3] - box[axis]) / 2; + box[axis] -= margin; + box[axis + 3] += margin; + } + } + } + bounds[index] = box; + return box; + } + + private static void extend(float[] box, float x, float y, float z) { + if (x < box[0]) box[0] = x; + if (y < box[1]) box[1] = y; + if (z < box[2]) box[2] = z; + if (x > box[3]) box[3] = x; + if (y > box[4]) box[4] = y; + if (z > box[5]) box[5] = z; + } + + // 頂点の並び順: 表は 0,1,2,3、裏は 3,2,1,0 + private static final int[] ORDER = {0, 1, 2, 3, 3, 2, 1, 0}; + private static final float[] U = {1, 1, 0, 0}; + private static final float[] V = {1, 0, 0, 1}; + + private float[] buildMesh(float signYaw, boolean wall) { + final float moveZ = wall ? WALL_OFFSET : 0f; + final double angle = Math.toRadians(-signYaw - 180); + final float sin = (float) Math.sin(angle); + final float cos = (float) Math.cos(angle); + + final float[] mesh = new float[VERTEX_COUNT * STRIDE]; + for (int i = 0; i < VERTEX_COUNT; i++) { + final int v = ORDER[i]; + final boolean front = i < 4; + final float x = base[v * 3]; + final float y = base[v * 3 + 1]; + final float z = base[v * 3 + 2] + moveZ + (front ? FACE_OFFSET : -FACE_OFFSET); + final float nz = front ? 1 : -1; + + final int o = i * STRIDE; + // 看板の向きに回転し、ブロックの中心に合わせる + mesh[o] = (x * cos + z * sin) * 0.5f + 0.5f; + mesh[o + 1] = y * 0.5f + 0.5f; + mesh[o + 2] = (-x * sin + z * cos) * 0.5f + 0.5f; + mesh[o + 3] = U[v]; + mesh[o + 4] = V[v]; + mesh[o + 5] = nz * sin; + mesh[o + 6] = 0; + mesh[o + 7] = nz * cos; + } + return mesh; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/sign/SignManager.java b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignManager.java new file mode 100644 index 00000000..2e4928f4 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignManager.java @@ -0,0 +1,270 @@ +package marumasa.marumasa_sign.core.sign; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.Platform; +import marumasa.marumasa_sign.core.gltf.GltfModel; +import marumasa.marumasa_sign.core.gltf.GltfScene; +import marumasa.marumasa_sign.core.image.DecodedImage; +import marumasa.marumasa_sign.core.image.ImageLoader; +import marumasa.marumasa_sign.core.media.Ffmpeg; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 看板の文字列から表示する画像を引くための管理クラス。 + */ +public final class SignManager { + + private final Platform platform; + private final ImageLoader loader; + + // 読み込み済み看板マップ (看板の文字列 -> 画像) + private final Map signs = new ConcurrentHashMap(); + // 読み込み済みテクスチャマップ (URL -> テクスチャ) + private final Map textures = new ConcurrentHashMap(); + // 再生中の動画や音声 + private final List sessions = new ArrayList(); + private boolean ffmpegNoticeShown; + + // 読み込み中・読み込み失敗のときに表示するテクスチャ + private Object loadingTexture; + private Object errorTexture; + // 音声だけを再生しているときに表示するテクスチャ + private Object audioTexture; + private int placeholderWidth = 160; + private int placeholderHeight = 96; + + public SignManager(Platform platform, ImageLoader loader) { + this.platform = platform; + this.loader = loader; + } + + /** + * 看板の文字列に対応する画像を返す。MarumaSign の看板でなければ null。 + * メインスレッドから呼ぶこと。 + */ + public SignImage get(String text) { + if (!SignSpec.looksLikeSign(text)) return null; + + SignImage image = signs.get(text); + if (image != null) return image; + + final SignSpec spec = SignSpec.parse(text); + if (spec == null) return null; + + image = new SignImage(spec, texture(spec.url)); + signs.put(text, image); + return image; + } + + private TextureEntry texture(final String url) { + TextureEntry entry = textures.get(url); + if (entry != null) return entry; + + ensurePlaceholders(); + final TextureEntry created = new TextureEntry(TextureEntry.LOADING, placeholderWidth, placeholderHeight, loadingTexture); + textures.put(url, created); + + loader.request(url, new ImageLoader.Callback() { + @Override + public void onLoaded(final DecodedImage decoded) { + platform.execute(new Runnable() { + @Override + public void run() { + register(url, created, decoded); + } + }); + } + + @Override + public void onModel(final GltfScene scene) { + platform.execute(new Runnable() { + @Override + public void run() { + registerModel(url, created, scene); + } + }); + } + + @Override + public void onMedia() { + platform.execute(new Runnable() { + @Override + public void run() { + startMedia(url, created); + } + }); + } + + @Override + public void onFailed() { + platform.execute(new Runnable() { + @Override + public void run() { + fail(url, created); + } + }); + } + }); + return created; + } + + private void register(String url, TextureEntry entry, DecodedImage decoded) { + // キャッシュ削除後に届いた結果は捨てる + if (textures.get(url) != entry) return; + try { + final int count = decoded.frames.length; + final Object[] frames = new Object[count]; + final int[] frameEnd = new int[count]; + int time = 0; + for (int i = 0; i < count; i++) { + frames[i] = platform.createTexture(decoded.width, decoded.height, decoded.frames[i]); + time += Math.max(1, decoded.delays[i]); + frameEnd[i] = time; + } + entry.set(TextureEntry.LOADED, decoded.width, decoded.height, frames, frameEnd, decoded.repetitions, true); + MarumaSign.LOGGER.info("Load: " + url); + } catch (RuntimeException | Error e) { + // スケジュールされたタスクの中の例外は呼び出し元で捨てられるため、ここで記録する + MarumaSign.LOGGER.error("Failed to register texture: " + url, e); + fail(url, entry); + } + } + + private void registerModel(String url, TextureEntry entry, GltfScene scene) { + if (textures.get(url) != entry) return; + final GltfModel model = scene.model(); + final Object[] created = new Object[model.textureCount()]; + try { + for (int i = 0; i < created.length; i++) { + final GltfModel.Texture texture = model.texture(i); + created[i] = platform.createTexture(texture.width, texture.height, texture.pixels); + } + entry.setModel(scene, created); + MarumaSign.LOGGER.info("Load: " + url + " (" + model.triangleCount() + " triangles)"); + } catch (RuntimeException | Error e) { + MarumaSign.LOGGER.error("Failed to register model: " + url, e); + for (Object texture : created) { + MarumaSign.releaseTexture(platform, texture); + } + fail(url, entry); + } + } + + // 画像ではなかった URL を、動画や音声として再生する + private void startMedia(final String url, final TextureEntry entry) { + if (textures.get(url) != entry) return; + if (!Ffmpeg.isAvailable()) { + // 再生できない理由を、最初の 1 回だけチャットで知らせる + if (!ffmpegNoticeShown) { + ffmpegNoticeShown = true; + MarumaSign.chat("text.ffmpeg_missing"); + } + fail(url, entry); + return; + } + final MediaSession[] holder = new MediaSession[1]; + final MediaSession session = new MediaSession(platform, url, new MediaSession.Listener() { + @Override + public void onReady(int width, int height) { + if (textures.get(url) != entry) return; + if (width > 0) { + // テクスチャは再生の側が持っているので、ここでは所有しない + entry.set(TextureEntry.LOADED, width, height, new Object[]{holder[0].texture()}, new int[]{1}, 0, false); + } else { + // 音声だけの場合は、スピーカーの絵を表示する + entry.set(TextureEntry.LOADED, placeholderWidth, placeholderHeight, new Object[]{audioTexture}, new int[]{1}, 0, false); + } + MarumaSign.LOGGER.info("Play: " + url); + } + + @Override + public void onFailed() { + fail(url, entry); + } + }); + holder[0] = session; + entry.setMedia(session); + sessions.add(session); + session.start(); + } + + private void fail(String url, TextureEntry entry) { + if (textures.get(url) != entry) return; + entry.set(TextureEntry.ERROR, placeholderWidth, placeholderHeight, new Object[]{errorTexture}, new int[]{1}, 0, false); + } + + private void ensurePlaceholders() { + if (loadingTexture != null) return; + final DecodedImage loading = ImageLoader.readResource("/marumasa_sign/loading.png"); + final DecodedImage error = ImageLoader.readResource("/marumasa_sign/error.png"); + placeholderWidth = loading.width; + placeholderHeight = loading.height; + loadingTexture = platform.createTexture(loading.width, loading.height, loading.frames[0]); + errorTexture = platform.createTexture(error.width, error.height, error.frames[0]); + audioTexture = platform.createTexture(placeholderWidth, placeholderHeight, speakerIcon(placeholderWidth, placeholderHeight)); + } + + // スピーカーの絵を描く + private static int[] speakerIcon(int width, int height) { + final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); + final Graphics2D g = image.createGraphics(); + try { + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g.setColor(new Color(0x3C3C3C)); + g.fillRect(0, 0, width, height); + g.setColor(new Color(0x6ABE30)); + final int cx = width / 2 - height / 6; + final int cy = height / 2; + final int unit = height / 8; + // 本体 + g.fillRect(cx - unit * 2, cy - unit, unit, unit * 2); + g.fillPolygon(new int[]{cx - unit, cx + unit, cx + unit, cx - unit}, + new int[]{cy - unit, cy - unit * 2 - unit / 2, cy + unit * 2 + unit / 2, cy + unit}, 4); + // 音の波 + g.setStroke(new BasicStroke(Math.max(2f, unit / 2f), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); + for (int i = 1; i <= 3; i++) { + final int radius = unit * (i + 1); + g.drawArc(cx + unit - radius / 2, cy - radius, radius * 2, radius * 2, -40, 80); + } + } finally { + g.dispose(); + } + return image.getRGB(0, 0, width, height, null, 0, width); + } + + // tick ごとに呼ぶ + public void tick() { + for (int i = 0; i < sessions.size(); i++) { + sessions.get(i).tick(); + } + } + + // 読み込み待ち・読み込み中の画像があるかどうか + public boolean isBusy() { + return loader.isBusy(); + } + + // 登録されているテクスチャをすべて削除する + public void clearCache() { + for (MediaSession session : sessions) { + session.close(); + } + sessions.clear(); + for (TextureEntry entry : textures.values()) { + for (Object frame : entry.ownedTextures()) { + MarumaSign.releaseTexture(platform, frame); + } + } + signs.clear(); + textures.clear(); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/sign/SignSpec.java b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignSpec.java new file mode 100644 index 00000000..2c741681 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignSpec.java @@ -0,0 +1,105 @@ +package marumasa.marumasa_sign.core.sign; + +import java.util.Locale; + +/** + * 看板に書かれる文字列の内容。 + * フォーマット: URL|X|Y|Z|横幅|高さ|Z軸回転|Y軸回転|X軸回転 + */ +public final class SignSpec { + + public static final int PARAMETER_COUNT = 9; + + public final String url; + // 位置 + public final float x, y, z; + // 大きさ + public final float scaleX, scaleY; + // 回転 + public final float roll, yaw, pitch; + + public SignSpec(String url, float x, float y, float z, float scaleX, float scaleY, float roll, float yaw, float pitch) { + this.url = url; + this.x = x; + this.y = y; + this.z = z; + this.scaleX = scaleX; + this.scaleY = scaleY; + this.roll = roll; + this.yaw = yaw; + this.pitch = pitch; + } + + public SignSpec withUrl(String url) { + return new SignSpec(url, x, y, z, scaleX, scaleY, roll, yaw, pitch); + } + + // 看板の文字列が MarumaSign の形式になりうるかどうかを軽く判定する + public static boolean looksLikeSign(String text) { + if (text == null || text.length() < 2 * PARAMETER_COUNT - 1) return false; + int count = 0; + for (int i = 0, len = text.length(); i < len; i++) { + if (text.charAt(i) == '|' && ++count >= PARAMETER_COUNT - 1) return true; + } + return false; + } + + public static SignSpec parse(String text) { + if (!looksLikeSign(text)) return null; + final String[] p = text.split("\\|"); + if (p.length < PARAMETER_COUNT) return null; + try { + return new SignSpec( + p[0], + Float.parseFloat(p[1]), Float.parseFloat(p[2]), Float.parseFloat(p[3]), + Float.parseFloat(p[4]), Float.parseFloat(p[5]), + Float.parseFloat(p[6]), Float.parseFloat(p[7]), Float.parseFloat(p[8]) + ); + } catch (NumberFormatException e) { + return null; + } + } + + public static boolean isSign(String text) { + return parse(text) != null; + } + + public String toText() { + return url.replace("|", "") + + '|' + number(x) + '|' + number(y) + '|' + number(z) + + '|' + number(scaleX) + '|' + number(scaleY) + + '|' + number(roll) + '|' + number(yaw) + '|' + number(pitch); + } + + // 看板に収まりやすいように、できるだけ短い表記にする + public static String number(float value) { + if (Float.isNaN(value) || Float.isInfinite(value)) return "0"; + if (value == (long) value) return Long.toString((long) value); + String s = String.format(Locale.ROOT, "%.3f", value); + int end = s.length(); + while (end > 0 && s.charAt(end - 1) == '0') end--; + if (end > 0 && s.charAt(end - 1) == '.') end--; + s = s.substring(0, end); + if (s.startsWith("0.")) return s.substring(1); + if (s.startsWith("-0.")) return "-" + s.substring(2); + return s.isEmpty() || s.equals("-") ? "0" : s; + } + + // 文字列を看板の 4 行に均等に分ける。入りきらない場合は null + public static String[] splitLines(String text, int maxLineLength) { + if (text == null) text = ""; + final int len = text.length(); + if (len > maxLineLength * 4) return null; + + final String[] result = new String[4]; + final int base = len / 4; + final int remainder = len % 4; + int start = 0; + for (int i = 0; i < 4; i++) { + final int size = base + (i < remainder ? 1 : 0); + result[i] = text.substring(start, start + size); + start += size; + } + return result; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/sign/SignText.java b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignText.java new file mode 100644 index 00000000..8119fa4d --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/sign/SignText.java @@ -0,0 +1,61 @@ +package marumasa.marumasa_sign.core.sign; + +import marumasa.marumasa_sign.core.util.Json; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * アイテムのデータに保存されている看板の文字を、書かれている文字だけにする。 + * 保存の形式は Minecraft のバージョンによって違い、文字そのままのことも、 + * JSON などで書かれたテキストコンポーネントのこともある。 + */ +public final class SignText { + + // JSON として読めなかったデータから、文字の部分を取り出す + private static final Pattern TEXT_FIELD = Pattern.compile("\"?text\"?\\s*:\\s*\"((?:[^\"\\\\]|\\\\.)*)\""); + + private SignText() { + } + + /** + * 看板 1 行分のデータを、書かれている文字にする。 + */ + public static String plain(String raw) { + if (raw == null || raw.isEmpty()) return ""; + final char first = raw.charAt(0); + if (first != '{' && first != '[' && first != '"') return raw; + try { + final StringBuilder builder = new StringBuilder(); + flatten(Json.parse(raw), builder); + return builder.toString(); + } catch (IOException e) { + // キーに引用符のない形式など + final Matcher matcher = TEXT_FIELD.matcher(raw); + final StringBuilder builder = new StringBuilder(); + boolean found = false; + while (matcher.find()) { + found = true; + builder.append(matcher.group(1).replace("\\\"", "\"").replace("\\\\", "\\")); + } + return found ? builder.toString() : raw; + } + } + + // テキストコンポーネントの中の文字を、順につなげる + private static void flatten(Object value, StringBuilder builder) { + if (value instanceof String) { + builder.append((String) value); + } else if (value instanceof List) { + for (Object item : (List) value) flatten(item, builder); + } else if (value instanceof Map) { + final Map map = (Map) value; + final Object text = map.get("text"); + if (text instanceof String) builder.append((String) text); + flatten(map.get("extra"), builder); + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/sign/TextureEntry.java b/core/src/main/java/marumasa/marumasa_sign/core/sign/TextureEntry.java new file mode 100644 index 00000000..865bdbe5 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/sign/TextureEntry.java @@ -0,0 +1,129 @@ +package marumasa.marumasa_sign.core.sign; + +import marumasa.marumasa_sign.core.gltf.GltfScene; + +/** + * URL ごとの画像テクスチャ。読み込み中・失敗の場合は代わりの画像を指す。 + * 動画や音声の場合は、再生中のフレームを映すテクスチャを指す。 + * 3D モデルの場合は、モデルと、その材質のテクスチャを持つ。 + */ +public final class TextureEntry { + + public static final int LOADING = 0; + public static final int LOADED = 1; + public static final int ERROR = 2; + + private volatile int state; + private int width; + private int height; + // フレームごとのテクスチャ (アニメーションでなければ 1 つ) + private Object[] frames; + // 各フレームが終わる時刻 (ミリ秒, 累積) + private int[] frameEnd; + private int repetitions; + private long loadedAt; + // 状態が変わるたびに増える。SignImage が頂点を作り直すために使う + private volatile int revision; + // 動画や音声の再生。画像なら null + private MediaSession media; + // frames のテクスチャをこのエントリが所有しているかどうか (共用の画像を指しているだけなら false) + private boolean ownsTextures; + // 3D モデル。画像なら null + private GltfScene model; + + TextureEntry(int state, int width, int height, Object texture) { + set(state, width, height, new Object[]{texture}, new int[]{1}, 0, false); + } + + void set(int state, int width, int height, Object[] frames, int[] frameEnd, int repetitions, boolean ownsTextures) { + this.width = width; + this.height = height; + this.frames = frames; + this.frameEnd = frameEnd; + this.repetitions = repetitions; + this.ownsTextures = ownsTextures; + this.loadedAt = System.currentTimeMillis(); + this.state = state; + this.revision++; + } + + // 3D モデルを表示する状態にする。textures はモデルのテクスチャと同じ並び + void setModel(GltfScene model, Object[] textures) { + this.model = model; + set(LOADED, 1, 1, textures, new int[]{1}, 0, true); + } + + // 3D モデル。画像なら null + GltfScene model() { + return model; + } + + Object modelTexture(int index) { + return frames[index]; + } + + // 読み込んでからの時間 (秒)。アニメーションの時刻に使う + float modelTime() { + return (System.currentTimeMillis() - loadedAt) / 1000f; + } + + void setMedia(MediaSession media) { + this.media = media; + } + + MediaSession media() { + return media; + } + + public int state() { + return state; + } + + public int width() { + return width; + } + + public int height() { + return height; + } + + int revision() { + return revision; + } + + // このエントリが所有していて、破棄するときに解放するべきテクスチャ + Object[] ownedTextures() { + return ownsTextures ? frames : new Object[0]; + } + + /** + * 現在表示するべきテクスチャ。描画のたびに呼ぶ。 + * + * @param distance カメラから看板までの距離 (ブロック)。音量の計算に使う + */ + public Object current(double distance) { + if (media != null) media.use(distance); + + final Object[] frames = this.frames; + if (frames.length == 1) return frames[0]; + + final int[] frameEnd = this.frameEnd; + final int total = frameEnd[frameEnd.length - 1]; + if (total <= 0) return frames[0]; + + final long elapsed = System.currentTimeMillis() - loadedAt; + if (repetitions > 0 && elapsed >= (long) total * repetitions) { + return frames[frames.length - 1]; + } + + final int time = (int) (elapsed % total); + // 二分探索で time より後に終わる最初のフレームを探す + int low = 0, high = frameEnd.length - 1; + while (low < high) { + final int mid = (low + high) >>> 1; + if (frameEnd[mid] > time) high = mid; + else low = mid + 1; + } + return frames[low]; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/Button.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/Button.java new file mode 100644 index 00000000..b1f76b43 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/Button.java @@ -0,0 +1,70 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Graphics2D; + +public class Button extends Widget { + + public static final int NORMAL = 0; + public static final int HOVER = 1; + public static final int PRESSED = 2; + public static final int DISABLED = 3; + + private final String text; + private final Runnable action; + private boolean pressed; + private boolean inside; + + public Button(String text, Runnable action) { + this.text = text; + this.action = action; + } + + @Override + public boolean focusable() { + return enabled; + } + + public void click() { + if (enabled && visible) action.run(); + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + final int state = !enabled ? DISABLED : pressed && inside ? PRESSED : hover ? HOVER : NORMAL; + final boolean isDefault = focused || (page != null && page.defaultButton == this && !(page.focus instanceof Button)); + Theme.paintButton(g, x, y, w, h, text, state, isDefault); + } + + @Override + public void mousePressed(int mx, int my, boolean doubleClick) { + pressed = true; + inside = true; + repaint(); + } + + @Override + public void mouseDragged(int mx, int my) { + final boolean now = contains(mx, my); + if (now != inside) { + inside = now; + repaint(); + } + } + + @Override + public void mouseReleased(int mx, int my) { + final boolean fire = pressed && contains(mx, my); + pressed = false; + repaint(); + if (fire) click(); + } + + @Override + public boolean keyPressed(int key, int modifiers) { + if (key == Key.ENTER || key == Key.SPACE) { + click(); + return true; + } + return false; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/FileBrowserPage.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/FileBrowserPage.java new file mode 100644 index 00000000..e7e12fd2 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/FileBrowserPage.java @@ -0,0 +1,171 @@ +package marumasa.marumasa_sign.core.ui; + +import marumasa.marumasa_sign.core.Lang; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.media.MediaTools; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Locale; + +/** + * 画像ファイルを選ぶ画面。 + */ +final class FileBrowserPage extends Page { + + private static final String[] EXTENSIONS = {".png", ".jpg", ".jpeg", ".gif", ".apng", ".glb", ".gltf"}; + + private final MainPage owner; + private final TextField location; + private final ListBox list; + private final Button open; + + // 表示中のフォルダ。null のときはドライブの一覧 + private File directory; + private final List entries = new ArrayList(); + + FileBrowserPage(UiRoot root, MainPage owner) { + super(root); + this.owner = owner; + + add(new Label(Lang.get("browser.location")).bounds(12, 38, 56, 21)); + location = add(new TextField().onEnter(this::locationEntered)); + location.bounds(70, 38, 386, 21); + add(new Button(Lang.get("browser.up"), this::up)).bounds(462, 37, 74, 23); + + list = add(new ListBox().onSelect(this::selectionChanged).onActivate(this::activate)); + list.bounds(12, 66, 524, 268); + + add(new Label(Lang.get("browser.filter"))).bounds(12, 348, 340, 16); + open = add(new Button(Lang.get("browser.open"), this::activate)); + open.bounds(362, 344, 84, 24); + final Button cancel = add(new Button(Lang.get("ui.cancel"), root::showMainPage)); + cancel.bounds(452, 344, 84, 24); + + defaultButton = open; + cancelButton = cancel; + + navigate(startDirectory()); + } + + @Override + public String title() { + return Lang.get("browser.title"); + } + + @Override + public void shown() { + setFocus(list); + } + + private File startDirectory() { + // 入力欄がファイルを指していれば、そのフォルダから始める + final String current = owner.getSource(); + if (!current.isEmpty()) { + final File parent = new File(current).getAbsoluteFile().getParentFile(); + if (parent != null && parent.isDirectory()) return parent; + } + final String last = MarumaSign.config().getLastDirectory(); + if (!last.isEmpty() && new File(last).isDirectory()) return new File(last); + + final File home = new File(System.getProperty("user.home", ".")); + final File pictures = new File(home, "Pictures"); + return pictures.isDirectory() ? pictures : home; + } + + private static boolean isImage(File file) { + final String name = file.getName().toLowerCase(Locale.ROOT); + for (String extension : EXTENSIONS) { + if (name.endsWith(extension)) return true; + } + return MediaTools.hasMediaExtension(name); + } + + private static final Comparator BY_NAME = new Comparator() { + @Override + public int compare(File a, File b) { + return a.getName().compareToIgnoreCase(b.getName()); + } + }; + + private void navigate(File target) { + final List folders = new ArrayList(); + final List files = new ArrayList(); + if (target == null) { + final File[] roots = File.listRoots(); + if (roots != null) folders.addAll(Arrays.asList(roots)); + } else { + final File[] children = target.listFiles(); + if (children == null) return; + for (File child : children) { + if (child.isHidden()) continue; + if (child.isDirectory()) folders.add(child); + else if (isImage(child)) files.add(child); + } + folders.sort(BY_NAME); + files.sort(BY_NAME); + } + + directory = target; + entries.clear(); + entries.addAll(folders); + entries.addAll(files); + + final List names = new ArrayList(); + for (File entry : entries) { + // ドライブは名前が空になるのでパスをそのまま表示する + final String name = entry.getName().isEmpty() ? entry.getPath() : entry.getName(); + names.add(entry.isDirectory() && !name.endsWith(File.separator) ? name + File.separator : name); + } + list.setItems(names); + location.setText(target == null ? "" : target.getAbsolutePath()); + open.enabled = false; + repaint(); + } + + private void up() { + if (directory == null) return; + navigate(directory.getAbsoluteFile().getParentFile()); + } + + private void locationEntered() { + final String text = location.getText().trim(); + if (text.isEmpty()) { + navigate(null); + return; + } + final File file = new File(text); + if (file.isDirectory()) { + navigate(file); + setFocus(list); + } else if (file.isFile()) { + choose(file); + } + } + + private void selectionChanged() { + open.enabled = list.getSelected() >= 0; + repaint(); + } + + private void activate() { + final int index = list.getSelected(); + if (index < 0 || index >= entries.size()) return; + final File entry = entries.get(index); + if (entry.isDirectory()) { + navigate(entry); + } else { + choose(entry); + } + } + + private void choose(File file) { + final File parent = file.getAbsoluteFile().getParentFile(); + if (parent != null) MarumaSign.config().setLastDirectory(parent.getAbsolutePath()); + owner.setSource(file.getAbsolutePath()); + root.showMainPage(); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/GroupBox.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/GroupBox.java new file mode 100644 index 00000000..e3e2c8e6 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/GroupBox.java @@ -0,0 +1,23 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Graphics2D; + +public class GroupBox extends Widget { + + private final String title; + + public GroupBox(String title) { + this.title = title; + } + + @Override + public boolean contains(int mx, int my) { + // 中に置いた部品への操作を邪魔しない + return false; + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + Theme.paintGroup(g, x, y, w, h, title); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/ImageView.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/ImageView.java new file mode 100644 index 00000000..c2a326ae --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/ImageView.java @@ -0,0 +1,43 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; + +/** + * 画像を枠の中に収まる大きさで表示する。 + */ +public class ImageView extends Widget { + + private BufferedImage image; + private String placeholder = ""; + + public void setImage(BufferedImage image) { + this.image = image; + repaint(); + } + + public void setPlaceholder(String placeholder) { + this.placeholder = placeholder == null ? "" : placeholder; + repaint(); + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + Theme.paintField(g, x, y, w, h, true); + final BufferedImage image = this.image; + if (image == null) { + Theme.drawTextCentered(g, Theme.ellipsize(g, placeholder, w - 8), x, y, w, h, Theme.TEXT_DISABLED); + return; + } + final int areaW = w - 8; + final int areaH = h - 8; + final double ratio = Math.min((double) areaW / image.getWidth(), (double) areaH / image.getHeight()); + final int drawW = Math.max(1, (int) Math.round(image.getWidth() * ratio)); + final int drawH = Math.max(1, (int) Math.round(image.getHeight() * ratio)); + final Object hint = g.getRenderingHint(RenderingHints.KEY_INTERPOLATION); + g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + g.drawImage(image, x + (w - drawW) / 2, y + (h - drawH) / 2, drawW, drawH, null); + if (hint != null) g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, hint); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/Key.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/Key.java new file mode 100644 index 00000000..2707fa2d --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/Key.java @@ -0,0 +1,97 @@ +package marumasa.marumasa_sign.core.ui; + +/** + * 画面で使うキー。入力ライブラリごとのキーコードをここで共通の値に変換する。 + */ +public final class Key { + + public static final int UNKNOWN = 0; + public static final int BACKSPACE = 1; + public static final int DELETE = 2; + public static final int LEFT = 3; + public static final int RIGHT = 4; + public static final int UP = 5; + public static final int DOWN = 6; + public static final int HOME = 7; + public static final int END = 8; + public static final int ENTER = 9; + public static final int ESCAPE = 10; + public static final int TAB = 11; + public static final int PAGE_UP = 12; + public static final int PAGE_DOWN = 13; + public static final int SPACE = 14; + public static final int A = 20; + public static final int C = 21; + public static final int V = 22; + public static final int X = 23; + + public static final int MOD_SHIFT = 1; + public static final int MOD_CTRL = 2; + + private Key() { + } + + // GLFW (Minecraft 1.13 以降) のキーコードから変換する + public static int fromGlfw(int key) { + switch (key) { + case 259: return BACKSPACE; + case 261: return DELETE; + case 263: return LEFT; + case 262: return RIGHT; + case 265: return UP; + case 264: return DOWN; + case 268: return HOME; + case 269: return END; + case 257: + case 335: return ENTER; + case 256: return ESCAPE; + case 258: return TAB; + case 266: return PAGE_UP; + case 267: return PAGE_DOWN; + case 32: return SPACE; + case 65: return A; + case 67: return C; + case 86: return V; + case 88: return X; + default: return UNKNOWN; + } + } + + // GLFW の修飾キーのビットから変換する (Super は Ctrl として扱う) + public static int modifiersFromGlfw(int mods) { + int result = 0; + if ((mods & 0x1) != 0) result |= MOD_SHIFT; + if ((mods & 0x2) != 0 || (mods & 0x8) != 0) result |= MOD_CTRL; + return result; + } + + // LWJGL 2 (Minecraft 1.12.2 以前) のキーコードから変換する + public static int fromLwjgl2(int key) { + switch (key) { + case 14: return BACKSPACE; + case 211: return DELETE; + case 203: return LEFT; + case 205: return RIGHT; + case 200: return UP; + case 208: return DOWN; + case 199: return HOME; + case 207: return END; + case 28: + case 156: return ENTER; + case 1: return ESCAPE; + case 15: return TAB; + case 201: return PAGE_UP; + case 209: return PAGE_DOWN; + case 57: return SPACE; + case 30: return A; + case 46: return C; + case 47: return V; + case 45: return X; + default: return UNKNOWN; + } + } + + public static int modifiers(boolean shift, boolean ctrl) { + return (shift ? MOD_SHIFT : 0) | (ctrl ? MOD_CTRL : 0); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/Label.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/Label.java new file mode 100644 index 00000000..7bfe335c --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/Label.java @@ -0,0 +1,31 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Color; +import java.awt.Graphics2D; + +public class Label extends Widget { + + private String text; + private Color color = Theme.TEXT; + + public Label(String text) { + this.text = text; + } + + public void setText(String text, Color color) { + if (text == null) text = ""; + if (text.equals(this.text) && color.equals(this.color)) return; + this.text = text; + this.color = color; + repaint(); + } + + public void setText(String text) { + setText(text, Theme.TEXT); + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + Theme.drawText(g, Theme.ellipsize(g, text, w), x, y, h, enabled ? color : Theme.TEXT_DISABLED); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/ListBox.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/ListBox.java new file mode 100644 index 00000000..2066cee0 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/ListBox.java @@ -0,0 +1,188 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Shape; +import java.util.ArrayList; +import java.util.List; + +public class ListBox extends Widget { + + private static final int ROW_HEIGHT = 16; + private static final int SCROLL_WIDTH = 15; + + private final List items = new ArrayList(); + private int selected = -1; + // 一番上に表示している行 + private int top; + private Runnable onSelect; + private Runnable onActivate; + // スクロールバーのつまみをドラッグしているときの、つかんだ位置 + private int dragOffset = -1; + + public ListBox onSelect(Runnable onSelect) { + this.onSelect = onSelect; + return this; + } + + // ダブルクリックや Enter で項目が決定されたとき + public ListBox onActivate(Runnable onActivate) { + this.onActivate = onActivate; + return this; + } + + public void setItems(List values) { + items.clear(); + items.addAll(values); + selected = -1; + top = 0; + repaint(); + } + + public int getSelected() { + return selected; + } + + @Override + public boolean focusable() { + return enabled; + } + + private int visibleRows() { + return Math.max(1, (h - 2) / ROW_HEIGHT); + } + + private int maxTop() { + return Math.max(0, items.size() - visibleRows()); + } + + private boolean hasScrollBar() { + return items.size() > visibleRows(); + } + + private void setTop(int value) { + value = Math.max(0, Math.min(maxTop(), value)); + if (value != top) { + top = value; + repaint(); + } + } + + private void select(int index) { + index = Math.max(0, Math.min(items.size() - 1, index)); + if (items.isEmpty()) index = -1; + if (index == selected) return; + selected = index; + if (selected >= 0) { + if (selected < top) top = selected; + if (selected >= top + visibleRows()) top = selected - visibleRows() + 1; + } + repaint(); + if (onSelect != null) onSelect.run(); + } + + private int thumbHeight() { + return Math.max(16, (h - 2) * visibleRows() / Math.max(1, items.size())); + } + + private int thumbY() { + final int range = h - 2 - thumbHeight(); + return y + 1 + (maxTop() == 0 ? 0 : range * top / maxTop()); + } + + @Override + public void mousePressed(int mx, int my, boolean doubleClick) { + if (hasScrollBar() && mx >= x + w - SCROLL_WIDTH - 1) { + final int thumbY = thumbY(); + if (my < thumbY) { + setTop(top - visibleRows()); + } else if (my >= thumbY + thumbHeight()) { + setTop(top + visibleRows()); + } else { + dragOffset = my - thumbY; + } + return; + } + final int row = top + (my - y - 1) / ROW_HEIGHT; + if (row < 0 || row >= items.size()) return; + select(row); + if (doubleClick && onActivate != null) onActivate.run(); + } + + @Override + public void mouseDragged(int mx, int my) { + if (dragOffset < 0) return; + final int range = h - 2 - thumbHeight(); + if (range <= 0) return; + setTop(Math.round((float) (my - dragOffset - y - 1) * maxTop() / range)); + } + + @Override + public void mouseReleased(int mx, int my) { + dragOffset = -1; + } + + @Override + public boolean mouseScrolled(int amount) { + setTop(top - amount * 3); + return true; + } + + @Override + public boolean keyPressed(int key, int modifiers) { + switch (key) { + case Key.UP: + select(selected - 1); + return true; + case Key.DOWN: + select(selected + 1); + return true; + case Key.PAGE_UP: + select(selected - visibleRows()); + return true; + case Key.PAGE_DOWN: + select(selected + visibleRows()); + return true; + case Key.HOME: + select(0); + return true; + case Key.END: + select(items.size() - 1); + return true; + case Key.ENTER: + if (selected < 0 || onActivate == null) return false; + onActivate.run(); + return true; + default: + return false; + } + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + Theme.paintField(g, x, y, w, h, enabled); + + final boolean scrollBar = hasScrollBar(); + final int rowWidth = w - 2 - (scrollBar ? SCROLL_WIDTH : 0); + final Shape clip = g.getClip(); + g.clipRect(x + 1, y + 1, rowWidth, h - 2); + final int rows = visibleRows() + 1; + for (int i = 0; i < rows; i++) { + final int index = top + i; + if (index >= items.size()) break; + final int rowY = y + 1 + i * ROW_HEIGHT; + final boolean isSelected = index == selected; + if (isSelected) { + g.setColor(focused ? Theme.SELECTION : Theme.GROUP_BORDER); + g.fillRect(x + 1, rowY, rowWidth, ROW_HEIGHT); + } + final Color color = isSelected && focused ? Color.WHITE : Theme.TEXT; + Theme.drawText(g, Theme.ellipsize(g, items.get(index), rowWidth - 8), x + 5, rowY, ROW_HEIGHT, color); + } + g.setClip(clip); + + if (scrollBar) { + Theme.paintScrollBar(g, x + w - SCROLL_WIDTH - 1, y + 1, SCROLL_WIDTH, h - 2, thumbY(), thumbHeight()); + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/MainPage.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/MainPage.java new file mode 100644 index 00000000..ac709bb7 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/MainPage.java @@ -0,0 +1,442 @@ +package marumasa.marumasa_sign.core.ui; + +import marumasa.marumasa_sign.core.Config; +import marumasa.marumasa_sign.core.Lang; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.gltf.GltfLoader; +import marumasa.marumasa_sign.core.gltf.GltfPacker; +import marumasa.marumasa_sign.core.gltf.GltfPreview; +import marumasa.marumasa_sign.core.gltf.GltfScene; +import marumasa.marumasa_sign.core.image.DecodedImage; +import marumasa.marumasa_sign.core.image.ImageLoader; +import marumasa.marumasa_sign.core.media.MediaTools; +import marumasa.marumasa_sign.core.net.Http; +import marumasa.marumasa_sign.core.sign.SignSpec; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 画像と表示方法を決めて、看板に書き込むための画面。 + */ +public final class MainPage extends Page { + + // 入力が止まってからプレビューを読み込むまでの時間 (tick) + private static final int PREVIEW_DELAY = 8; + + private final TextField source; + private final Button browse; + private final NumberField width, height; + private final NumberField posX, posY, posZ; + private final NumberField rotX, rotY, rotZ; + private final NumberField threads; + private final NumberField volume; + private final Button clearCache; + private final ImageView preview; + private final Label previewInfo; + private final Label status; + private final Button place; + + private boolean busy; + private int previewCountdown = -1; + private int previewGeneration; + + // アップロード済みのファイル (パスと更新日時と大きさ -> URL) + private final Map uploaded = new HashMap(); + + MainPage(UiRoot root) { + super(root); + + add(new GroupBox(Lang.get("ui.group.image")).bounds(12, 34, 344, 78)); + add(new Label(Lang.get("ui.source")).bounds(22, 50, 324, 14)); + source = add(new TextField().onChange(this::sourceChanged)); + source.bounds(22, 66, 244, 21); + browse = add(new Button(Lang.get("ui.browse"), this::openBrowser)); + browse.bounds(272, 65, 74, 23); + if (root.platform.supportsFileDrop()) { + add(new Label(Lang.get("ui.drop_hint")).bounds(22, 91, 324, 14)).enabled = false; + } + + add(new GroupBox(Lang.get("ui.group.size")).bounds(12, 116, 110, 106)); + width = numberRow(Lang.get("ui.width"), 22, 134, 36, 56, 1f, 0.1f); + height = numberRow(Lang.get("ui.height"), 22, 162, 36, 56, 1f, 0.1f); + + add(new GroupBox(Lang.get("ui.group.position")).bounds(128, 116, 110, 106)); + posX = numberRow("X", 138, 134, 18, 74, 0f, 0.1f); + posY = numberRow("Y", 138, 162, 18, 74, 0f, 0.1f); + posZ = numberRow("Z", 138, 190, 18, 74, 0f, 0.1f); + + add(new GroupBox(Lang.get("ui.group.rotation")).bounds(244, 116, 112, 106)); + rotX = numberRow("X", 254, 134, 18, 76, 0f, 5f); + rotY = numberRow("Y", 254, 162, 18, 76, 0f, 5f); + rotZ = numberRow("Z", 254, 190, 18, 76, 0f, 5f); + + final Config config = MarumaSign.config(); + add(new GroupBox(Lang.get("ui.group.settings")).bounds(12, 226, 344, 80)); + add(new Label(Lang.get("ui.threads")).bounds(22, 246, 136, 21)); + threads = add(new NumberField(config.getMaxThreads(), Config.MIN_THREADS, Config.MAX_THREADS, 1f, true)); + threads.bounds(160, 246, 48, 21); + threads.onChange(() -> config.setMaxThreads(Math.round(threads.getValue()))); + clearCache = add(new Button(Lang.get("ui.clear_cache"), this::clearCache)); + clearCache.bounds(216, 245, 132, 23); + add(new Label(Lang.get("ui.volume")).bounds(22, 274, 136, 21)); + volume = add(new NumberField(config.getVolume(), 0, 100, 5f, true)); + volume.bounds(160, 274, 48, 21); + volume.onChange(() -> config.setVolume(Math.round(volume.getValue()))); + + add(new GroupBox(Lang.get("ui.group.preview")).bounds(364, 34, 172, 272)); + preview = add(new ImageView()); + preview.bounds(372, 52, 156, 228); + preview.setPlaceholder(Lang.get("ui.preview.none")); + previewInfo = add(new Label("")); + previewInfo.bounds(372, 284, 156, 14); + + status = add(new Label(Lang.get("ui.status.ready"))); + status.bounds(12, 318, 524, 16); + + place = add(new Button(Lang.get("ui.place"), this::place)); + place.bounds(318, 344, 128, 24); + final Button cancel = add(new Button(Lang.get("ui.cancel"), root::close)); + cancel.bounds(452, 344, 84, 24); + + defaultButton = place; + cancelButton = cancel; + } + + private NumberField numberRow(String label, int x, int y, int labelWidth, int fieldWidth, float value, float step) { + add(new Label(label).bounds(x, y, labelWidth, 21)); + final NumberField field = add(new NumberField(value, -1000f, 1000f, step, false)); + field.bounds(x + labelWidth + 4, y, fieldWidth, 21); + return field; + } + + @Override + public String title() { + return "MarumaSign"; + } + + @Override + public void shown() { + if (focus == null) setFocus(source); + } + + public void setSource(String value) { + source.setText(value); + sourceChanged(); + } + + public String getSource() { + return source.getText().trim(); + } + + public boolean isBusy() { + return busy; + } + + public String statusText() { + return statusText; + } + + private String statusText = ""; + + private void setStatus(String text, boolean error) { + statusText = text; + status.setText(text, error ? Theme.ERROR_TEXT : Theme.TEXT); + } + + private void setBusy(boolean value) { + busy = value; + place.enabled = !value; + browse.enabled = !value; + source.enabled = !value; + repaint(); + } + + @Override + public void filesDropped(List files) { + if (busy) return; + setSource(files.get(0).getAbsolutePath()); + } + + private void openBrowser() { + root.showPage(new FileBrowserPage(root, this)); + } + + private void clearCache() { + if (MarumaSign.signs().isBusy()) { + setStatus(Lang.get("ui.status.cache_busy"), true); + return; + } + MarumaSign.signs().clearCache(); + setStatus(Lang.get("ui.status.cache_cleared"), false); + } + + // ---------- プレビュー ---------- + + private void sourceChanged() { + previewGeneration++; + previewCountdown = PREVIEW_DELAY; + } + + @Override + public void tick() { + if (previewCountdown < 0) return; + if (previewCountdown-- > 0) return; + loadPreview(); + } + + // プレビューの画像の一辺の長さ (3D モデルの場合) + private static final int MODEL_PREVIEW_SIZE = 256; + + // ファイルの先頭のバイト列を読む + private static byte[] readHead(File file) throws IOException { + if (!file.isFile()) throw new IOException(Lang.get("ui.status.file_not_found", file.getPath())); + final byte[] head = new byte[16]; + final int length; + final InputStream input = new FileInputStream(file); + try { + length = Math.max(0, input.read(head)); + } finally { + input.close(); + } + return java.util.Arrays.copyOf(head, length); + } + + // 画像ファイルなら内容を返す。画像でなければ null + private static byte[] readImageFile(File file) throws IOException { + final byte[] head = readHead(file); + if (!ImageLoader.isSupportedImage(head, head.length)) return null; + if (file.length() > Http.MAX_SIZE) throw new IOException(Lang.get("ui.status.file_too_large", 10)); + return Files.readAllBytes(file.toPath()); + } + + // 3D モデルのファイルかどうか + private static boolean isModelFile(File file) throws IOException { + final byte[] head = readHead(file); + return ImageLoader.isModel(head, head.length); + } + + private static BufferedImage toBufferedImage(DecodedImage image) { + final BufferedImage result = new BufferedImage(image.width, image.height, BufferedImage.TYPE_INT_ARGB); + result.setRGB(0, 0, image.width, image.height, image.frames[0], 0, image.width); + return result; + } + + private void loadPreview() { + final String text = getSource(); + final int generation = previewGeneration; + if (text.isEmpty()) { + preview.setImage(null); + preview.setPlaceholder(Lang.get("ui.preview.none")); + previewInfo.setText(""); + return; + } + preview.setImage(null); + preview.setPlaceholder(Lang.get("ui.preview.loading")); + previewInfo.setText(""); + + worker("MarumaSign-Preview", () -> { + BufferedImage image = null; + String info = ""; + try { + final boolean[] isImage = new boolean[1]; + GltfScene model = null; + final byte[] bytes; + if (Http.isHttpUrl(text)) { + bytes = Http.download(text, new Http.HeadCheck() { + @Override + public boolean accept(byte[] head, int length) { + isImage[0] = ImageLoader.isSupportedImage(head, length); + return isImage[0] || ImageLoader.isModel(head, length); + } + }, ImageLoader.MAX_MODEL_SIZE); + if (bytes != null && !isImage[0]) model = ImageLoader.model(text, bytes); + } else { + final File file = new File(text); + bytes = readImageFile(file); + if (bytes == null && isModelFile(file)) model = loadModelFile(file); + } + if (model != null) { + image = GltfPreview.render(model, 0f, MODEL_PREVIEW_SIZE); + info = Lang.get("ui.preview.model", model.model().triangleCount()); + } else { + if (bytes != null) { + final DecodedImage decoded = ImageLoader.decode(bytes); + image = toBufferedImage(decoded); + } else { + // 画像でなければ、動画などから 1 枚取り出す + image = MediaTools.thumbnail(text); + } + if (image != null) info = image.getWidth() + " x " + image.getHeight(); + } + } catch (Exception e) { + // プレビューを表示できないだけなので、理由は画面に出すだけにする + } + final BufferedImage result = image; + final String resultInfo = info; + root.platform.execute(() -> { + if (generation != previewGeneration) return; + preview.setImage(result); + preview.setPlaceholder(Lang.get(result == null ? "ui.preview.failed" : "ui.preview.none")); + previewInfo.setText(resultInfo); + }); + }); + } + + private static void worker(String name, Runnable task) { + final Thread thread = new Thread(task, name); + thread.setDaemon(true); + thread.start(); + } + + // ---------- 看板への書き込み ---------- + + // 入力欄の内容。URL はあとで withUrl で入れる + private SignSpec spec() { + // 看板のフォーマットでは回転が Z, Y, X の順に並ぶ + return new SignSpec("", + posX.getValue(), posY.getValue(), posZ.getValue(), + width.getValue(), height.getValue(), + rotZ.getValue(), rotY.getValue(), rotX.getValue()); + } + + public void place() { + if (busy) return; + final String text = getSource(); + if (text.isEmpty()) { + setStatus(Lang.get("ui.status.no_source"), true); + return; + } + if (!root.platform.isInWorld()) { + setStatus(Lang.get("ui.status.not_in_world"), true); + return; + } + final int capacity = root.platform.maxSignLineLength() * 4; + final SignSpec spec = spec(); + setBusy(true); + + worker("MarumaSign-Upload", () -> { + String error = null; + String signText = null; + try { + String url = Http.isHttpUrl(text) ? text : upload(new File(text)); + signText = spec.withUrl(url).toText(); + if (signText.length() > capacity) { + // 看板に入りきらない場合は URL を短縮する + progress(Lang.get("ui.status.shortening")); + url = Http.shorten(url); + signText = spec.withUrl(url).toText(); + } + if (signText.length() > capacity) { + error = Lang.get("ui.status.too_long", signText.length(), capacity); + } + } catch (Exception e) { + MarumaSign.LOGGER.info("Could not prepare the sign text: " + e); + error = e.getMessage() != null ? e.getMessage() : e.toString(); + } + + final String resultError = error; + final String resultText = signText; + root.platform.execute(() -> { + setBusy(false); + if (resultError != null) { + setStatus(resultError, true); + return; + } + setStatus(Lang.get("ui.status.ready"), false); + root.close(); + MarumaSign.requestWrite(resultText); + }); + }); + } + + private void progress(final String message) { + root.platform.execute(() -> setStatus(message, false)); + } + + // 3D モデルのファイルを読み込む。JSON ではあるがモデルではないファイルなら null + private static GltfScene loadModelFile(File file) { + try { + return ImageLoader.model(file); + } catch (IOException e) { + MarumaSign.LOGGER.info("Could not load the model: " + e.getMessage()); + return null; + } + } + + private String upload(File file) throws IOException { + final byte[] bytes = readImageFile(file); + File packed = null; + if (bytes != null) { + try { + ImageLoader.decode(bytes); + } catch (IOException e) { + throw new IOException(Lang.get("ui.status.not_image")); + } + } else if (isModelFile(file)) { + if (file.length() > ImageLoader.MAX_MODEL_SIZE) throw new IOException(Lang.get("ui.status.file_too_large", 64)); + final byte[] content = Files.readAllBytes(file.toPath()); + try { + // 表示できるモデルかどうかを確かめる + ImageLoader.model(file); + if (!GltfLoader.isGlb(content, content.length)) { + // 外部ファイルを参照していても 1 つのファイルで済むように、.glb にまとめる + final byte[] glb = GltfPacker.pack(content, ImageLoader.fileResources(file)); + packed = File.createTempFile("marumasign", ".glb"); + Files.write(packed.toPath(), glb); + } + } catch (IOException e) { + if (packed != null) packed.delete(); + MarumaSign.LOGGER.info("Could not load the model: " + e.getMessage()); + throw new IOException(Lang.get("ui.status.not_image")); + } + } else { + // 画像でなければ、動画や音声として再生できるかを確かめる + if (file.length() > Http.MAX_UPLOAD_SIZE) throw new IOException(Lang.get("ui.status.file_too_large", 200)); + if (!MediaTools.isPlayable(file)) throw new IOException(Lang.get("ui.status.not_image")); + } + + final String key = file.getAbsolutePath() + '|' + file.length() + '|' + file.lastModified(); + synchronized (uploaded) { + final String cached = uploaded.get(key); + if (cached != null) { + if (packed != null) packed.delete(); + return cached; + } + } + + progress(Lang.get("ui.status.uploading")); + final String url; + try { + url = Http.upload(packed != null ? packed : file); + } catch (IOException e) { + throw new IOException(Lang.get("ui.status.upload_failed", String.valueOf(e.getMessage()))); + } finally { + if (packed != null) packed.delete(); + } + synchronized (uploaded) { + uploaded.put(key, url); + } + return url; + } + + // ---------- 動作確認用 ---------- + + public void setParameters(float w, float h, float x, float y, float z, float rx, float ry, float rz) { + width.setValue(w); + height.setValue(h); + posX.setValue(x); + posY.setValue(y); + posZ.setValue(z); + rotX.setValue(rx); + rotY.setValue(ry); + rotZ.setValue(rz); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/NumberField.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/NumberField.java new file mode 100644 index 00000000..4a82a442 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/NumberField.java @@ -0,0 +1,122 @@ +package marumasa.marumasa_sign.core.ui; + +import marumasa.marumasa_sign.core.sign.SignSpec; + +import java.awt.Graphics2D; + +/** + * 数値の入力欄。右端のボタンとマウスホイールでも値を増減できる。 + */ +public class NumberField extends TextField { + + private static final int SPIN_WIDTH = 15; + + private final float min; + private final float max; + private final float step; + private final boolean integer; + private final float fallback; + // 押されているボタン (1: 上, -1: 下, 0: なし) + private int pressedSpin; + + public NumberField(float value, float min, float max, float step, boolean integer) { + this.min = min; + this.max = max; + this.step = step; + this.integer = integer; + this.fallback = value; + allowed(integer ? "0123456789-" : "0123456789-."); + maxLength(12); + setValue(value); + } + + public float getValue() { + try { + final float value = Float.parseFloat(getText()); + if (Float.isNaN(value) || Float.isInfinite(value)) return fallback; + return Math.max(min, Math.min(max, integer ? Math.round(value) : value)); + } catch (NumberFormatException e) { + return fallback; + } + } + + public void setValue(float value) { + setText(SignSpec.number(Math.max(min, Math.min(max, value)))); + } + + private void spin(int direction) { + // 誤差がたまらないように小数第 3 位で丸める + final float next = Math.round((getValue() + step * direction) * 1000f) / 1000f; + final String before = getText(); + setValue(next); + if (!before.equals(getText())) changed(); + } + + @Override + protected int innerWidth() { + return super.innerWidth() - SPIN_WIDTH; + } + + private int spinAt(int mx, int my) { + if (mx < x + w - SPIN_WIDTH - 1) return 0; + return my < y + h / 2 ? 1 : -1; + } + + @Override + public void mousePressed(int mx, int my, boolean doubleClick) { + pressedSpin = spinAt(mx, my); + if (pressedSpin != 0) { + spin(pressedSpin); + } else { + super.mousePressed(mx, my, doubleClick); + } + } + + @Override + public void mouseDragged(int mx, int my) { + if (pressedSpin == 0) super.mouseDragged(mx, my); + } + + @Override + public void mouseReleased(int mx, int my) { + pressedSpin = 0; + repaint(); + } + + @Override + public boolean mouseScrolled(int amount) { + spin(amount > 0 ? 1 : -1); + return true; + } + + @Override + public boolean keyPressed(int key, int modifiers) { + if (key == Key.UP) { + spin(1); + return true; + } + if (key == Key.DOWN) { + spin(-1); + return true; + } + return super.keyPressed(key, modifiers); + } + + @Override + public void focusLost() { + super.focusLost(); + // 範囲外や不正な入力を直す + final String before = getText(); + setValue(getValue()); + if (!before.equals(getText())) changed(); + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + super.paint(g, hover, focused); + final int bx = x + w - SPIN_WIDTH - 1; + final int half = (h - 2) / 2; + Theme.paintSpinButton(g, bx, y + 1, SPIN_WIDTH, half, true, pressedSpin == 1, enabled); + Theme.paintSpinButton(g, bx, y + 1 + half, SPIN_WIDTH, h - 2 - half, false, pressedSpin == -1, enabled); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/Page.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/Page.java new file mode 100644 index 00000000..9007ce7d --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/Page.java @@ -0,0 +1,155 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Graphics2D; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * ウィンドウの中身 1 画面分。部品の配置と、入力の振り分けを行う。 + */ +public abstract class Page { + + // ダブルクリックとみなす間隔 (ミリ秒) + private static final long DOUBLE_CLICK_MILLIS = 400; + + final UiRoot root; + private final List widgets = new ArrayList(); + + Widget focus; + private Widget hover; + private Widget pressed; + // Enter キーで押されるボタン + Button defaultButton; + // Esc キーで押されるボタン + Button cancelButton; + + private long lastClickTime; + private Widget lastClickWidget; + + protected Page(UiRoot root) { + this.root = root; + } + + public abstract String title(); + + // このページが表示されたとき + public void shown() { + } + + public void tick() { + } + + public void filesDropped(List files) { + } + + protected T add(T widget) { + widget.page = this; + widgets.add(widget); + return widget; + } + + protected void repaint() { + root.repaint(); + } + + public void setFocus(Widget widget) { + if (focus == widget) return; + final Widget old = focus; + focus = widget; + if (old != null) old.focusLost(); + root.resetCaret(); + repaint(); + } + + void paint(Graphics2D g) { + for (Widget widget : widgets) { + if (widget.visible) widget.paint(g, widget == hover && widget.enabled, widget == focus); + } + } + + private Widget widgetAt(int mx, int my) { + for (int i = widgets.size() - 1; i >= 0; i--) { + final Widget widget = widgets.get(i); + if (widget.visible && widget.contains(mx, my)) return widget; + } + return null; + } + + void mouseMoved(int mx, int my) { + if (pressed != null) { + pressed.mouseDragged(mx, my); + return; + } + final Widget now = widgetAt(mx, my); + if (now != hover) { + hover = now; + repaint(); + } + } + + void mousePressed(int mx, int my) { + final Widget target = widgetAt(mx, my); + hover = target; + if (target == null || !target.enabled) { + setFocus(null); + return; + } + final long now = System.currentTimeMillis(); + final boolean doubleClick = target == lastClickWidget && now - lastClickTime < DOUBLE_CLICK_MILLIS; + lastClickTime = doubleClick ? 0 : now; + lastClickWidget = target; + + setFocus(target.focusable() ? target : null); + pressed = target; + target.mousePressed(mx, my, doubleClick); + } + + void mouseReleased(int mx, int my) { + final Widget target = pressed; + pressed = null; + if (target != null) target.mouseReleased(mx, my); + hover = widgetAt(mx, my); + repaint(); + } + + void mouseScrolled(int mx, int my, int amount) { + final Widget target = widgetAt(mx, my); + if (target != null && target.enabled) target.mouseScrolled(amount); + } + + boolean keyPressed(int key, int modifiers) { + if (focus != null && focus.enabled && focus.keyPressed(key, modifiers)) return true; + switch (key) { + case Key.TAB: + moveFocus((modifiers & Key.MOD_SHIFT) != 0 ? -1 : 1); + return true; + case Key.ENTER: + if (defaultButton != null) defaultButton.click(); + return true; + case Key.ESCAPE: + if (cancelButton != null) cancelButton.click(); + return true; + default: + return false; + } + } + + void charTyped(char c) { + if (focus != null && focus.enabled) focus.charTyped(c); + } + + private void moveFocus(int direction) { + final int count = widgets.size(); + if (count == 0) return; + int index = focus == null ? (direction > 0 ? -1 : count) : widgets.indexOf(focus); + for (int i = 0; i < count; i++) { + index = (index + direction + count) % count; + final Widget widget = widgets.get(index); + if (widget.visible && widget.focusable()) { + setFocus(widget); + return; + } + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/TextField.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/TextField.java new file mode 100644 index 00000000..80aca714 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/TextField.java @@ -0,0 +1,271 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Graphics2D; +import java.awt.Shape; + +public class TextField extends Widget { + + private static final int PADDING = 4; + + protected final StringBuilder text = new StringBuilder(); + private int caret; + // 選択範囲のもう一方の端。caret と同じなら選択なし + private int anchor; + private int scroll; + private int maxLength = 2048; + // 入力できる文字。null ならすべて + private String allowed; + private Runnable onChange; + private Runnable onEnter; + + public TextField() { + } + + public TextField allowed(String allowed) { + this.allowed = allowed; + return this; + } + + public TextField maxLength(int maxLength) { + this.maxLength = maxLength; + return this; + } + + public TextField onChange(Runnable onChange) { + this.onChange = onChange; + return this; + } + + public TextField onEnter(Runnable onEnter) { + this.onEnter = onEnter; + return this; + } + + public String getText() { + return text.toString(); + } + + public void setText(String value) { + if (value == null) value = ""; + if (value.length() > maxLength) value = value.substring(0, maxLength); + if (value.contentEquals(text)) return; + text.setLength(0); + text.append(value); + caret = anchor = text.length(); + scroll = 0; + repaint(); + } + + @Override + public boolean focusable() { + return enabled; + } + + // 文字を描ける領域の幅 + protected int innerWidth() { + return w - PADDING * 2; + } + + private int widthTo(int index) { + // 描画と同じフォント (文字列全体で選んだもの) で測る + return Theme.textWidth(text.substring(0, index), Theme.font(text.toString())); + } + + protected void changed() { + repaint(); + if (onChange != null) onChange.run(); + } + + private boolean hasSelection() { + return caret != anchor; + } + + private void deleteSelection() { + final int start = Math.min(caret, anchor); + final int end = Math.max(caret, anchor); + text.delete(start, end); + caret = anchor = start; + } + + private String selection() { + return text.substring(Math.min(caret, anchor), Math.max(caret, anchor)); + } + + protected void insert(String value) { + final StringBuilder filtered = new StringBuilder(); + for (int i = 0; i < value.length(); i++) { + final char c = value.charAt(i); + if (c < 0x20 || c == 0x7F) continue; + if (allowed != null && allowed.indexOf(c) < 0) continue; + filtered.append(c); + } + if (filtered.length() == 0) return; + if (hasSelection()) deleteSelection(); + final int room = maxLength - text.length(); + if (room <= 0) return; + if (filtered.length() > room) filtered.setLength(room); + text.insert(caret, filtered); + caret += filtered.length(); + anchor = caret; + changed(); + } + + private void moveCaret(int position, boolean select) { + caret = Math.max(0, Math.min(text.length(), position)); + if (!select) anchor = caret; + repaint(); + } + + public void selectAll() { + anchor = 0; + caret = text.length(); + repaint(); + } + + @Override + public boolean keyPressed(int key, int modifiers) { + final boolean shift = (modifiers & Key.MOD_SHIFT) != 0; + final boolean ctrl = (modifiers & Key.MOD_CTRL) != 0; + switch (key) { + case Key.LEFT: + moveCaret(caret - 1, shift); + return true; + case Key.RIGHT: + moveCaret(caret + 1, shift); + return true; + case Key.HOME: + moveCaret(0, shift); + return true; + case Key.END: + moveCaret(text.length(), shift); + return true; + case Key.BACKSPACE: + if (hasSelection()) { + deleteSelection(); + changed(); + } else if (caret > 0) { + text.deleteCharAt(--caret); + anchor = caret; + changed(); + } + return true; + case Key.DELETE: + if (hasSelection()) { + deleteSelection(); + changed(); + } else if (caret < text.length()) { + text.deleteCharAt(caret); + changed(); + } + return true; + case Key.ENTER: + if (onEnter == null) return false; + onEnter.run(); + return true; + case Key.A: + if (!ctrl) return false; + selectAll(); + return true; + case Key.C: + case Key.X: + if (!ctrl) return false; + if (hasSelection() && page != null) { + page.root.platform.setClipboard(selection()); + if (key == Key.X) { + deleteSelection(); + changed(); + } + } + return true; + case Key.V: + if (!ctrl) return false; + if (page != null) { + final String clip = page.root.platform.getClipboard(); + if (clip != null) insert(clip.trim()); + } + return true; + default: + return false; + } + } + + @Override + public boolean charTyped(char c) { + insert(String.valueOf(c)); + return true; + } + + // クリックした位置に最も近い文字の境目を返す + private int indexAt(int mx) { + final int target = mx - x - PADDING + scroll; + int best = 0; + int bestDistance = Integer.MAX_VALUE; + for (int i = 0; i <= text.length(); i++) { + final int distance = Math.abs(widthTo(i) - target); + if (distance < bestDistance) { + bestDistance = distance; + best = i; + } + } + return best; + } + + @Override + public void mousePressed(int mx, int my, boolean doubleClick) { + if (doubleClick) { + selectAll(); + } else { + moveCaret(indexAt(mx), false); + } + } + + @Override + public void mouseDragged(int mx, int my) { + moveCaret(indexAt(mx), true); + } + + @Override + public void focusLost() { + anchor = caret; + scroll = 0; + repaint(); + } + + @Override + public void paint(Graphics2D g, boolean hover, boolean focused) { + Theme.paintField(g, x, y, w, h, enabled); + + final int inner = innerWidth(); + final int caretX = widthTo(caret); + // キャレットが見える位置までスクロールする + if (focused) { + if (caretX - scroll > inner) scroll = caretX - inner; + if (caretX - scroll < 0) scroll = caretX; + } + + final Shape clip = g.getClip(); + g.clipRect(x + PADDING - 1, y + 1, inner + 2, h - 2); + final int textX = x + PADDING - scroll; + if (focused && hasSelection()) { + final int start = widthTo(Math.min(caret, anchor)); + final int end = widthTo(Math.max(caret, anchor)); + g.setColor(Theme.SELECTION); + g.fillRect(textX + start, y + 3, end - start, h - 6); + } + Theme.drawText(g, text.toString(), textX, y, h, enabled ? Theme.TEXT : Theme.TEXT_DISABLED); + if (focused && hasSelection()) { + // 選択範囲の文字は白で重ねて描く + final int start = widthTo(Math.min(caret, anchor)); + final int end = widthTo(Math.max(caret, anchor)); + final Shape inside = g.getClip(); + g.clipRect(textX + start, y, end - start, h); + Theme.drawText(g, text.toString(), textX, y, h, java.awt.Color.WHITE); + g.setClip(inside); + } + if (focused && page != null && page.root.caretVisible()) { + g.setColor(Theme.TEXT); + g.drawLine(textX + caretX, y + 3, textX + caretX, y + h - 4); + } + g.setClip(clip); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/Theme.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/Theme.java new file mode 100644 index 00000000..86825c72 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/Theme.java @@ -0,0 +1,233 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.GradientPaint; +import java.awt.Graphics2D; +import java.awt.LinearGradientPaint; +import java.awt.Shape; +import java.awt.geom.Path2D; + +/** + * 画面の見た目 (クラシックなデスクトップ風) をまとめたクラス。 + */ +public final class Theme { + + public static final int TITLE_HEIGHT = 28; + public static final int BORDER = 3; + + public static final Color FACE = new Color(0xECE9D8); + public static final Color TEXT = Color.BLACK; + public static final Color TEXT_DISABLED = new Color(0xACA899); + public static final Color FIELD_BORDER = new Color(0x7F9DB9); + public static final Color FIELD_DISABLED = new Color(0xF5F4EA); + public static final Color SELECTION = new Color(0x316AC5); + public static final Color GROUP_BORDER = new Color(0xD0D0BF); + public static final Color GROUP_TITLE = new Color(0x0046D5); + public static final Color ERROR_TEXT = new Color(0xC00000); + + private static final Color FRAME = new Color(0x0831D9); + private static final Color BUTTON_BORDER = new Color(0x003C74); + private static final Color BUTTON_BORDER_DISABLED = new Color(0xC9C7BA); + private static final Color BUTTON_HOVER = new Color(0xE5971F); + private static final Color BUTTON_DEFAULT = new Color(0x89ADE4); + private static final Color SCROLL_TRACK = new Color(0xF3F1EC); + private static final Color SCROLL_THUMB = new Color(0xC3D5FD); + private static final Color SCROLL_BORDER = new Color(0x98B1E4); + + private static final float[] TITLE_STOPS = {0f, 0.08f, 0.40f, 0.88f, 0.95f, 1f}; + private static final Color[] TITLE_COLORS = { + new Color(0x0997FF), new Color(0x0053EE), new Color(0x0050EE), + new Color(0x0066FF), new Color(0x005BFF), new Color(0x003DD7) + }; + + private static final Font FONT = new Font("Tahoma", Font.PLAIN, 11); + private static final Font FONT_FALLBACK = new Font(Font.DIALOG, Font.PLAIN, 11); + private static final Font TITLE_FONT = new Font("Trebuchet MS", Font.BOLD, 13); + private static final Font TITLE_FONT_FALLBACK = new Font(Font.DIALOG, Font.BOLD, 13); + + private Theme() { + } + + // 文字列をすべて表示できるフォントを選ぶ (日本語などは代替フォントになる) + public static Font font(String text) { + return text == null || FONT.canDisplayUpTo(text) < 0 ? FONT : FONT_FALLBACK; + } + + private static Font titleFont(String text) { + return TITLE_FONT.canDisplayUpTo(text) < 0 ? TITLE_FONT : TITLE_FONT_FALLBACK; + } + + public static int textWidth(Graphics2D g, String text) { + return g.getFontMetrics(font(text)).stringWidth(text); + } + + // 描画先がない場面 (クリック位置の計算など) で文字列の幅を測るためのもの + private static final Graphics2D SCRATCH = + new java.awt.image.BufferedImage(1, 1, java.awt.image.BufferedImage.TYPE_INT_ARGB).createGraphics(); + + public static int textWidth(String text) { + return textWidth(SCRATCH, text); + } + + public static int textWidth(String text, Font font) { + return SCRATCH.getFontMetrics(font).stringWidth(text); + } + + // 文字列を縦方向の中央に描く + public static void drawText(Graphics2D g, String text, int x, int y, int height, Color color) { + if (text == null || text.isEmpty()) return; + final Font font = font(text); + final FontMetrics metrics = g.getFontMetrics(font); + g.setFont(font); + g.setColor(color); + g.drawString(text, x, y + (height - metrics.getHeight()) / 2 + metrics.getAscent()); + } + + public static void drawTextCentered(Graphics2D g, String text, int x, int y, int width, int height, Color color) { + drawText(g, text, x + (width - textWidth(g, text)) / 2, y, height, color); + } + + // 幅に収まらない文字列を末尾の "..." で省略する + public static String ellipsize(Graphics2D g, String text, int width) { + if (text == null || textWidth(g, text) <= width) return text; + final String dots = "..."; + int end = text.length(); + while (end > 0 && textWidth(g, text.substring(0, end) + dots) > width) end--; + return text.substring(0, end) + dots; + } + + // 上の角だけが丸い形 + private static Shape topRounded(float x, float y, float w, float h, float r) { + final Path2D.Float path = new Path2D.Float(); + path.moveTo(x, y + h); + path.lineTo(x, y + r); + path.quadTo(x, y, x + r, y); + path.lineTo(x + w - r, y); + path.quadTo(x + w, y, x + w, y + r); + path.lineTo(x + w, y + h); + path.closePath(); + return path; + } + + // ウィンドウの枠とタイトルバーを描く + public static void paintWindow(Graphics2D g, int width, int height, String title, int closeState) { + g.setColor(FRAME); + g.fill(topRounded(0, 0, width, height, 8)); + + g.setPaint(new LinearGradientPaint(0, 0, 0, TITLE_HEIGHT, TITLE_STOPS, TITLE_COLORS)); + g.fill(topRounded(0, 0, width, TITLE_HEIGHT, 8)); + + g.setColor(FACE); + g.fillRect(BORDER, TITLE_HEIGHT, width - BORDER * 2, height - TITLE_HEIGHT - BORDER); + + final Font font = titleFont(title); + final FontMetrics metrics = g.getFontMetrics(font); + final int baseline = (TITLE_HEIGHT - metrics.getHeight()) / 2 + metrics.getAscent(); + g.setFont(font); + g.setColor(new Color(0x0A1883)); + g.drawString(title, 9, baseline + 1); + g.setColor(Color.WHITE); + g.drawString(title, 8, baseline); + + paintCloseButton(g, closeX(width), CLOSE_Y, closeState); + } + + public static final int CLOSE_SIZE = 21; + public static final int CLOSE_Y = 4; + + public static int closeX(int windowWidth) { + return windowWidth - CLOSE_SIZE - 6; + } + + private static void paintCloseButton(Graphics2D g, int x, int y, int state) { + final Color top = state == Button.PRESSED ? new Color(0xB5320F) : state == Button.HOVER ? new Color(0xF1836A) : new Color(0xE7755A); + final Color bottom = state == Button.PRESSED ? new Color(0x8E2A0E) : state == Button.HOVER ? new Color(0xDB4A26) : new Color(0xC3391B); + g.setPaint(new GradientPaint(0, y, top, 0, y + CLOSE_SIZE, bottom)); + g.fillRoundRect(x, y, CLOSE_SIZE, CLOSE_SIZE, 6, 6); + g.setColor(Color.WHITE); + g.drawRoundRect(x, y, CLOSE_SIZE - 1, CLOSE_SIZE - 1, 6, 6); + + g.setStroke(new BasicStroke(2f)); + g.drawLine(x + 6, y + 6, x + CLOSE_SIZE - 7, y + CLOSE_SIZE - 7); + g.drawLine(x + CLOSE_SIZE - 7, y + 6, x + 6, y + CLOSE_SIZE - 7); + g.setStroke(new BasicStroke(1f)); + } + + public static void paintButton(Graphics2D g, int x, int y, int w, int h, String text, int state, boolean isDefault) { + final boolean disabled = state == Button.DISABLED; + if (state == Button.PRESSED) { + g.setPaint(new GradientPaint(0, y, new Color(0xD6D0C5), 0, y + h, new Color(0xECEBE5))); + } else { + g.setPaint(new GradientPaint(0, y, Color.WHITE, 0, y + h, disabled ? new Color(0xF5F4EA) : new Color(0xD6D0C5))); + } + g.fillRoundRect(x, y, w, h, 6, 6); + + if (!disabled && state == Button.HOVER) { + g.setColor(BUTTON_HOVER); + g.drawRoundRect(x + 1, y + 1, w - 3, h - 3, 4, 4); + } else if (!disabled && isDefault) { + g.setColor(BUTTON_DEFAULT); + g.drawRoundRect(x + 1, y + 1, w - 3, h - 3, 4, 4); + } + g.setColor(disabled ? BUTTON_BORDER_DISABLED : BUTTON_BORDER); + g.drawRoundRect(x, y, w - 1, h - 1, 6, 6); + + if (text != null) { + final int offset = state == Button.PRESSED ? 1 : 0; + drawTextCentered(g, text, x + offset, y + offset, w, h, disabled ? TEXT_DISABLED : TEXT); + } + } + + // 数値欄の右端にある、値を増減する小さなボタン + public static void paintSpinButton(Graphics2D g, int x, int y, int w, int h, boolean up, boolean pressed, boolean enabled) { + g.setPaint(pressed + ? new GradientPaint(0, y, new Color(0xB9C9EF), 0, y + h, new Color(0xDCE5FB)) + : new GradientPaint(0, y, new Color(0xE6EEFC), 0, y + h, new Color(0xC1D2F8))); + g.fillRect(x, y, w, h); + g.setColor(enabled ? SCROLL_BORDER : BUTTON_BORDER_DISABLED); + g.drawRect(x, y, w - 1, h - 1); + + // 上向き・下向きの小さな三角形 + g.setColor(enabled ? new Color(0x4D6185) : TEXT_DISABLED); + final int centerX = x + w / 2; + final int centerY = y + h / 2; + for (int i = 0; i < 3; i++) { + final int row = up ? centerY - 1 + i : centerY + 1 - i; + g.drawLine(centerX - i, row, centerX + i, row); + } + } + + public static void paintField(Graphics2D g, int x, int y, int w, int h, boolean enabled) { + g.setColor(enabled ? Color.WHITE : FIELD_DISABLED); + g.fillRect(x, y, w, h); + g.setColor(FIELD_BORDER); + g.drawRect(x, y, w - 1, h - 1); + } + + public static void paintGroup(Graphics2D g, int x, int y, int w, int h, String title) { + g.setColor(GROUP_BORDER); + g.drawRoundRect(x, y + 6, w - 1, h - 7, 6, 6); + if (title != null && !title.isEmpty()) { + final int textWidth = textWidth(g, title); + g.setColor(FACE); + g.fillRect(x + 7, y, textWidth + 6, 13); + drawText(g, title, x + 10, y, 13, GROUP_TITLE); + } + } + + public static void paintScrollBar(Graphics2D g, int x, int y, int w, int h, int thumbY, int thumbHeight) { + g.setColor(SCROLL_TRACK); + g.fillRect(x, y, w, h); + g.setColor(GROUP_BORDER); + g.drawLine(x, y, x, y + h - 1); + if (thumbHeight > 0) { + g.setColor(SCROLL_THUMB); + g.fillRoundRect(x + 2, thumbY, w - 3, thumbHeight, 4, 4); + g.setColor(SCROLL_BORDER); + g.drawRoundRect(x + 2, thumbY, w - 4, thumbHeight - 1, 4, 4); + } + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/UiRoot.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/UiRoot.java new file mode 100644 index 00000000..57c633c0 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/UiRoot.java @@ -0,0 +1,273 @@ +package marumasa.marumasa_sign.core.ui; + +import marumasa.marumasa_sign.core.Lang; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.Platform; + +import java.awt.AlphaComposite; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; +import java.awt.image.DataBufferInt; +import java.io.File; +import java.util.List; + +/** + * MarumaSign のウィンドウ。 + * 画面全体を 1 枚の画像として描画し、各バージョンの実装はそれをテクスチャとして表示するだけにする。 + * 座標の入力はすべてフレームバッファのピクセル単位で受け取る。 + */ +public final class UiRoot { + + // ウィンドウの大きさ (拡大前) + public static final int WIDTH = 548; + public static final int HEIGHT = 380; + + private static final int MAX_SCALE = 4; + // キャレットの点滅間隔 (tick) + private static final int CARET_TICKS = 10; + + final Platform platform; + + private MainPage mainPage; + private Page page; + private boolean open; + + private int scale = 1; + private int originX, originY; + private BufferedImage surface; + private int[] pixels; + private boolean dirty = true; + + private Object texture; + private int textureWidth, textureHeight; + + private int closeState = Button.NORMAL; + private boolean closePressed; + private int caretTicks; + + public UiRoot(Platform platform) { + this.platform = platform; + } + + public boolean isOpen() { + return open; + } + + public MainPage mainPage() { + return mainPage; + } + + // 画面が開かれたとき + public void opened() { + Lang.select(platform.languageCode()); + if (mainPage == null) mainPage = new MainPage(this); + open = true; + showPage(mainPage); + } + + // 画面が閉じられたとき + public void closed() { + open = false; + if (texture != null) { + MarumaSign.releaseTexture(platform, texture); + texture = null; + } + surface = null; + pixels = null; + } + + void showPage(Page next) { + page = next; + closeState = Button.NORMAL; + next.shown(); + repaint(); + } + + void showMainPage() { + showPage(mainPage); + } + + void close() { + platform.closeUi(); + } + + void repaint() { + dirty = true; + } + + void resetCaret() { + caretTicks = 0; + } + + boolean caretVisible() { + return caretTicks < CARET_TICKS; + } + + // ---------- 表示 ---------- + + // フレームバッファの大きさに合わせて、拡大率と位置を決める + public void layout(int framebufferWidth, int framebufferHeight) { + final int fit = Math.min(framebufferWidth / WIDTH, framebufferHeight / HEIGHT); + final int newScale = Math.max(1, Math.min(MAX_SCALE, fit)); + if (newScale != scale || surface == null) { + scale = newScale; + surface = new BufferedImage(WIDTH * scale, HEIGHT * scale, BufferedImage.TYPE_INT_ARGB); + pixels = ((DataBufferInt) surface.getRaster().getDataBuffer()).getData(); + dirty = true; + } + originX = Math.max(0, (framebufferWidth - WIDTH * scale) / 2); + originY = Math.max(0, (framebufferHeight - HEIGHT * scale) / 2); + } + + // 表示位置と大きさ (フレームバッファのピクセル単位) + public int originX() { + return originX; + } + + public int originY() { + return originY; + } + + public int pixelWidth() { + return WIDTH * scale; + } + + public int pixelHeight() { + return HEIGHT * scale; + } + + /** + * 現在の画面内容のテクスチャを返す。毎フレーム呼ぶこと。 + * 内容が変わっていれば描き直してテクスチャを更新する。 + */ + public Object texture() { + if (surface == null || page == null) return null; + final int width = pixelWidth(); + final int height = pixelHeight(); + if (texture != null && (textureWidth != width || textureHeight != height)) { + MarumaSign.releaseTexture(platform, texture); + texture = null; + } + if (dirty || texture == null) { + paint(); + dirty = false; + if (texture == null) { + texture = platform.createTexture(width, height, pixels); + textureWidth = width; + textureHeight = height; + } else { + platform.updateTexture(texture, width, height, pixels); + } + } + return texture; + } + + private void paint() { + final Graphics2D g = surface.createGraphics(); + try { + g.setComposite(AlphaComposite.Clear); + g.fillRect(0, 0, surface.getWidth(), surface.getHeight()); + g.setComposite(AlphaComposite.SrcOver); + + g.scale(scale, scale); + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP); + g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); + + Theme.paintWindow(g, WIDTH, HEIGHT, page.title(), closeState); + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); + page.paint(g); + } catch (RuntimeException e) { + MarumaSign.LOGGER.error("Failed to paint the window", e); + } finally { + g.dispose(); + } + } + + // ---------- 入力 ---------- + + private int toLocalX(double px) { + return (int) Math.floor((px - originX) / scale); + } + + private int toLocalY(double py) { + return (int) Math.floor((py - originY) / scale); + } + + private boolean onClose(int mx, int my) { + final int cx = Theme.closeX(WIDTH); + return mx >= cx && mx < cx + Theme.CLOSE_SIZE && my >= Theme.CLOSE_Y && my < Theme.CLOSE_Y + Theme.CLOSE_SIZE; + } + + private void setCloseState(int state) { + if (closeState != state) { + closeState = state; + repaint(); + } + } + + public void mouseMoved(double px, double py) { + if (page == null) return; + final int mx = toLocalX(px), my = toLocalY(py); + final boolean over = onClose(mx, my); + setCloseState(closePressed ? (over ? Button.PRESSED : Button.NORMAL) : over ? Button.HOVER : Button.NORMAL); + if (!closePressed) page.mouseMoved(mx, my); + } + + public void mousePressed(double px, double py) { + if (page == null) return; + final int mx = toLocalX(px), my = toLocalY(py); + if (onClose(mx, my)) { + closePressed = true; + setCloseState(Button.PRESSED); + return; + } + page.mousePressed(mx, my); + } + + public void mouseReleased(double px, double py) { + if (page == null) return; + final int mx = toLocalX(px), my = toLocalY(py); + if (closePressed) { + closePressed = false; + setCloseState(Button.NORMAL); + if (onClose(mx, my)) close(); + return; + } + page.mouseReleased(mx, my); + } + + // amount: 上方向が正 + public void mouseScrolled(double px, double py, double amount) { + if (page == null || amount == 0) return; + page.mouseScrolled(toLocalX(px), toLocalY(py), amount > 0 ? 1 : -1); + } + + // key, modifiers は Key クラスの値 + public boolean keyPressed(int key, int modifiers) { + if (page == null) return false; + resetCaret(); + repaint(); + return page.keyPressed(key, modifiers); + } + + public void charTyped(char c) { + if (page == null) return; + resetCaret(); + page.charTyped(c); + } + + public void filesDropped(List files) { + if (page == null || files == null || files.isEmpty()) return; + showMainPage(); + mainPage.filesDropped(files); + } + + public void tick() { + if (!open || page == null) return; + caretTicks = (caretTicks + 1) % (CARET_TICKS * 2); + if (page.focus instanceof TextField && (caretTicks == 0 || caretTicks == CARET_TICKS)) repaint(); + page.tick(); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/ui/Widget.java b/core/src/main/java/marumasa/marumasa_sign/core/ui/Widget.java new file mode 100644 index 00000000..f231de50 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/ui/Widget.java @@ -0,0 +1,62 @@ +package marumasa.marumasa_sign.core.ui; + +import java.awt.Graphics2D; + +/** + * 画面の部品。座標はウィンドウの左上を原点とした、拡大前の値。 + */ +public abstract class Widget { + + public int x, y, w, h; + public boolean visible = true; + public boolean enabled = true; + + Page page; + + public Widget bounds(int x, int y, int w, int h) { + this.x = x; + this.y = y; + this.w = w; + this.h = h; + return this; + } + + public boolean contains(int mx, int my) { + return mx >= x && my >= y && mx < x + w && my < y + h; + } + + // Tab キーでフォーカスを受け取るかどうか + public boolean focusable() { + return false; + } + + public abstract void paint(Graphics2D g, boolean hover, boolean focused); + + public void mousePressed(int mx, int my, boolean doubleClick) { + } + + public void mouseDragged(int mx, int my) { + } + + public void mouseReleased(int mx, int my) { + } + + public boolean mouseScrolled(int amount) { + return false; + } + + public boolean keyPressed(int key, int modifiers) { + return false; + } + + public boolean charTyped(char c) { + return false; + } + + public void focusLost() { + } + + protected void repaint() { + if (page != null) page.repaint(); + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/util/Json.java b/core/src/main/java/marumasa/marumasa_sign/core/util/Json.java new file mode 100644 index 00000000..dc4b643c --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/util/Json.java @@ -0,0 +1,304 @@ +package marumasa.marumasa_sign.core.util; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * JSON の読み取り。Minecraft のバージョンごとに同梱ライブラリが違うため、自前で持つ。 + * オブジェクトは Map、配列は List、数値は Double、文字列は String、真偽値は Boolean、null は null になる。 + */ +public final class Json { + + // 入れ子の深さの上限 + private static final int MAX_DEPTH = 256; + + private final String text; + private int pos; + + private Json(String text) { + this.text = text; + } + + public static Object parse(String text) throws IOException { + final Json json = new Json(text); + // 先頭に BOM が付いていることがある + if (text.length() > 0 && text.charAt(0) == '') json.pos = 1; + final Object value = json.value(0); + json.skipSpace(); + if (json.pos != text.length()) throw json.error("Unexpected trailing text"); + return value; + } + + private IOException error(String message) { + return new IOException("Invalid JSON at " + pos + ": " + message); + } + + private void skipSpace() { + while (pos < text.length()) { + final char c = text.charAt(pos); + if (c != ' ' && c != '\t' && c != '\n' && c != '\r') break; + pos++; + } + } + + private Object value(int depth) throws IOException { + if (depth > MAX_DEPTH) throw error("Too deep"); + skipSpace(); + if (pos >= text.length()) throw error("Unexpected end"); + final char c = text.charAt(pos); + switch (c) { + case '{': + return object(depth); + case '[': + return array(depth); + case '"': + return string(); + case 't': + expect("true"); + return Boolean.TRUE; + case 'f': + expect("false"); + return Boolean.FALSE; + case 'n': + expect("null"); + return null; + default: + return number(); + } + } + + private void expect(String word) throws IOException { + if (!text.startsWith(word, pos)) throw error("Expected " + word); + pos += word.length(); + } + + private Map object(int depth) throws IOException { + final Map map = new LinkedHashMap(); + pos++; + skipSpace(); + if (pos < text.length() && text.charAt(pos) == '}') { + pos++; + return map; + } + while (true) { + skipSpace(); + if (pos >= text.length() || text.charAt(pos) != '"') throw error("Expected a name"); + final String name = string(); + skipSpace(); + if (pos >= text.length() || text.charAt(pos) != ':') throw error("Expected ':'"); + pos++; + map.put(name, value(depth + 1)); + skipSpace(); + if (pos >= text.length()) throw error("Unexpected end"); + final char c = text.charAt(pos++); + if (c == '}') return map; + if (c != ',') throw error("Expected ',' or '}'"); + } + } + + private List array(int depth) throws IOException { + final List list = new ArrayList(); + pos++; + skipSpace(); + if (pos < text.length() && text.charAt(pos) == ']') { + pos++; + return list; + } + while (true) { + list.add(value(depth + 1)); + skipSpace(); + if (pos >= text.length()) throw error("Unexpected end"); + final char c = text.charAt(pos++); + if (c == ']') return list; + if (c != ',') throw error("Expected ',' or ']'"); + } + } + + private String string() throws IOException { + final StringBuilder builder = new StringBuilder(); + pos++; + while (true) { + if (pos >= text.length()) throw error("Unterminated string"); + final char c = text.charAt(pos++); + if (c == '"') return builder.toString(); + if (c != '\\') { + builder.append(c); + continue; + } + if (pos >= text.length()) throw error("Unterminated string"); + final char escaped = text.charAt(pos++); + switch (escaped) { + case 'b': + builder.append('\b'); + break; + case 'f': + builder.append('\f'); + break; + case 'n': + builder.append('\n'); + break; + case 'r': + builder.append('\r'); + break; + case 't': + builder.append('\t'); + break; + case 'u': + if (pos + 4 > text.length()) throw error("Invalid escape"); + try { + builder.append((char) Integer.parseInt(text.substring(pos, pos + 4), 16)); + } catch (NumberFormatException e) { + throw error("Invalid escape"); + } + pos += 4; + break; + default: + // \" \\ \/ はそのままの文字 + builder.append(escaped); + } + } + } + + private Double number() throws IOException { + final int start = pos; + while (pos < text.length()) { + final char c = text.charAt(pos); + if ((c >= '0' && c <= '9') || c == '-' || c == '+' || c == '.' || c == 'e' || c == 'E') pos++; + else break; + } + if (start == pos) throw error("Unexpected character"); + try { + return Double.valueOf(text.substring(start, pos)); + } catch (NumberFormatException e) { + throw error("Invalid number"); + } + } + + // 読み取った値を JSON の文字列に戻す + public static String write(Object value) { + final StringBuilder builder = new StringBuilder(); + write(value, builder); + return builder.toString(); + } + + private static void write(Object value, StringBuilder builder) { + if (value instanceof Map) { + builder.append('{'); + boolean first = true; + for (Map.Entry entry : ((Map) value).entrySet()) { + if (!first) builder.append(','); + first = false; + writeString(String.valueOf(entry.getKey()), builder); + builder.append(':'); + write(entry.getValue(), builder); + } + builder.append('}'); + } else if (value instanceof List) { + builder.append('['); + boolean first = true; + for (Object item : (List) value) { + if (!first) builder.append(','); + first = false; + write(item, builder); + } + builder.append(']'); + } else if (value instanceof String) { + writeString((String) value, builder); + } else if (value instanceof Number) { + final double number = ((Number) value).doubleValue(); + if (Double.isNaN(number) || Double.isInfinite(number)) { + builder.append('0'); + } else if (number == Math.rint(number) && Math.abs(number) < 1e15) { + // 整数は小数点なしで書く (番号として読まれる値のため) + builder.append((long) number); + } else { + builder.append(number); + } + } else { + builder.append(String.valueOf(value)); + } + } + + private static void writeString(String text, StringBuilder builder) { + builder.append('"'); + for (int i = 0; i < text.length(); i++) { + final char c = text.charAt(i); + if (c == '"' || c == '\\') { + builder.append('\\').append(c); + } else if (c < 0x20 || c > 0x7E) { + builder.append(String.format("\\u%04x", (int) c)); + } else { + builder.append(c); + } + } + builder.append('"'); + } + + // 以下は読み取った値を取り出すための補助 + + @SuppressWarnings("unchecked") + public static Map object(Object value) { + return value instanceof Map ? (Map) value : Collections.emptyMap(); + } + + @SuppressWarnings("unchecked") + public static List array(Object value) { + return value instanceof List ? (List) value : Collections.emptyList(); + } + + public static Map object(Map parent, String name) { + return object(parent.get(name)); + } + + public static List array(Map parent, String name) { + return array(parent.get(name)); + } + + public static int integer(Map parent, String name, int fallback) { + final Object value = parent.get(name); + return value instanceof Double ? (int) Math.round((Double) value) : fallback; + } + + public static float number(Map parent, String name, float fallback) { + final Object value = parent.get(name); + return value instanceof Double ? ((Double) value).floatValue() : fallback; + } + + public static String string(Map parent, String name, String fallback) { + final Object value = parent.get(name); + return value instanceof String ? (String) value : fallback; + } + + public static boolean bool(Map parent, String name, boolean fallback) { + final Object value = parent.get(name); + return value instanceof Boolean ? (Boolean) value : fallback; + } + + // 決まった長さの数値の配列。長さが違えば fallback を返す + public static float[] numbers(Map parent, String name, float[] fallback) { + final List list = array(parent.get(name)); + if (list.size() != fallback.length) return fallback.clone(); + final float[] result = new float[list.size()]; + for (int i = 0; i < result.length; i++) { + final Object value = list.get(i); + if (!(value instanceof Double)) return fallback.clone(); + result[i] = ((Double) value).floatValue(); + } + return result; + } + + // 長さが決まっていない数値の配列 + public static float[] numbers(Object value) { + final List list = array(value); + final float[] result = new float[list.size()]; + for (int i = 0; i < result.length; i++) { + final Object item = list.get(i); + result[i] = item instanceof Double ? ((Double) item).floatValue() : 0f; + } + return result; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/util/OptionsFile.java b/core/src/main/java/marumasa/marumasa_sign/core/util/OptionsFile.java new file mode 100644 index 00000000..911fb95e --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/util/OptionsFile.java @@ -0,0 +1,33 @@ +package marumasa.marumasa_sign.core.util; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.List; + +/** + * Minecraft の options.txt から、指定した項目だけを読む。 + * 設定全体を読み直すと他の項目に影響するため、Mod のキーの割り当てはこれで個別に読む。 + */ +public final class OptionsFile { + + private OptionsFile() { + } + + // 項目の値を返す。ファイルや項目がなければ null + public static String read(File gameDirectory, String key) { + final File file = new File(gameDirectory, "options.txt"); + if (!file.isFile()) return null; + final String prefix = key + ":"; + try { + final List lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8); + for (String line : lines) { + if (line.startsWith(prefix)) return line.substring(prefix.length()).trim(); + } + } catch (IOException | RuntimeException e) { + // 読めなければ既定のキーのままにする + } + return null; + } +} diff --git a/core/src/main/java/marumasa/marumasa_sign/core/util/Reflect.java b/core/src/main/java/marumasa/marumasa_sign/core/util/Reflect.java new file mode 100644 index 00000000..b3926b72 --- /dev/null +++ b/core/src/main/java/marumasa/marumasa_sign/core/util/Reflect.java @@ -0,0 +1,118 @@ +package marumasa.marumasa_sign.core.util; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +/** + * 名前に頼らないリフレクション。 + * フィールド名は Minecraft のバージョンや実行環境によって変わるため、型で探す。 + */ +public final class Reflect { + + private Reflect() { + } + + // owner で宣言されているフィールドのうち、型が type に代入できる最初のものを返す + public static Field fieldOfType(Class owner, Class type) { + for (Field field : owner.getDeclaredFields()) { + if (type.isAssignableFrom(field.getType())) { + field.setAccessible(true); + return field; + } + } + throw new IllegalStateException("No field of type " + type.getName() + " in " + owner.getName()); + } + + // instance のフィールドのうち、いま value そのものを保持しているものを返す + public static Field fieldHolding(Object instance, Object value) { + for (Class type = instance.getClass(); type != null; type = type.getSuperclass()) { + for (Field field : type.getDeclaredFields()) { + if (java.lang.reflect.Modifier.isStatic(field.getModifiers()) || field.getType().isPrimitive()) continue; + field.setAccessible(true); + try { + if (field.get(instance) == value) return field; + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } + } + } + throw new IllegalStateException("No field holding the value in " + instance.getClass().getName()); + } + + // owner の public なメソッドのうち、引数の型が parameters と一致する最初のものを返す (戻り値の型は問わない)。 + // 近いバージョンの間で、戻り値の型だけが違うメソッドを呼ぶのに使う + public static Method methodWithParameters(Class owner, Class... parameters) { + for (Method method : owner.getMethods()) { + if (java.util.Arrays.equals(method.getParameterTypes(), parameters)) return method; + } + throw new IllegalStateException("No method taking " + java.util.Arrays.toString(parameters) + " in " + owner.getName()); + } + + public static Object invoke(Method method, Object instance, Object... arguments) { + try { + return method.invoke(instance, arguments); + } catch (InvocationTargetException e) { + if (e.getCause() instanceof RuntimeException) throw (RuntimeException) e.getCause(); + throw new IllegalStateException(e.getCause()); + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } + } + + // 引数の数が arguments と同じ public なコンストラクタで作る。そのようなコンストラクタがなければ null。 + // 近いバージョンの間で、引数の数が違うコンストラクタを呼ぶのに使う + @SuppressWarnings("unchecked") + public static T construct(Class type, Object... arguments) { + for (Constructor constructor : type.getConstructors()) { + if (constructor.getParameterTypes().length != arguments.length) continue; + try { + return (T) constructor.newInstance(arguments); + } catch (InvocationTargetException e) { + if (e.getCause() instanceof RuntimeException) throw (RuntimeException) e.getCause(); + throw new IllegalStateException(e.getCause()); + } catch (ReflectiveOperationException e) { + throw new IllegalStateException(e); + } + } + return null; + } + + public static void set(Field field, Object instance, Object value) { + try { + field.set(instance, value); + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } + } + + /** + * static final のフィールドを書き換える。 + * 普通のリフレクションでは書き換えられないか、Java のバージョンによって警告が出るため、 + * JDK が用意しているメモリの直接操作 (sun.misc.Unsafe) を使う。このクラスは古い Java では + * コンパイル時に参照できないので、名前で呼び出す (JDK のクラスなので、名前は実行環境によって変わらない)。 + * 実行中のコードが値を定数として取り込む前に、できるだけ早い時点で呼ぶこと。 + */ + public static void setStaticFinal(Field field, Object value) { + try { + final Class unsafeClass = Class.forName("sun.misc.Unsafe"); + final Field holder = unsafeClass.getDeclaredField("theUnsafe"); + holder.setAccessible(true); + final Object unsafe = holder.get(null); + final Object base = unsafeClass.getMethod("staticFieldBase", Field.class).invoke(unsafe, field); + final Object offset = unsafeClass.getMethod("staticFieldOffset", Field.class).invoke(unsafe, field); + unsafeClass.getMethod("putObjectVolatile", Object.class, long.class, Object.class).invoke(unsafe, base, offset, value); + } catch (ReflectiveOperationException e) { + throw new IllegalStateException(e); + } + } + @SuppressWarnings("unchecked") + public static T get(Field field, Object instance) { + try { + return (T) field.get(instance); + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } + } +} diff --git a/src/main/resources/assets/marumasa_sign/textures/misc/error.png b/core/src/main/resources/marumasa_sign/error.png similarity index 100% rename from src/main/resources/assets/marumasa_sign/textures/misc/error.png rename to core/src/main/resources/marumasa_sign/error.png diff --git a/core/src/main/resources/marumasa_sign/lang/chat.properties b/core/src/main/resources/marumasa_sign/lang/chat.properties new file mode 100644 index 00000000..d890dfb9 --- /dev/null +++ b/core/src/main/resources/marumasa_sign/lang/chat.properties @@ -0,0 +1,351 @@ +# チャットに表示するメッセージの翻訳。キーは「言語コード.メッセージ名」。 +# alias.<言語コード> は、翻訳がない言語を近い言語に割り当てる。どちらもなければ en_us を使う。 + +en_us.text.write_mode=Place a sign to write the image on it. +en_us.text.write_done=The image was written to the sign. +en_us.text.ffmpeg_missing=FFmpeg is required to play videos and audio. + +ja_jp.text.write_mode=看板を設置すると、画像が書き込まれます。 +ja_jp.text.write_done=看板に画像を書き込みました。 +ja_jp.text.ffmpeg_missing=動画と音声の再生には FFmpeg が必要です。 + +af_za.text.write_mode=Plaas 'n bordjie om die prent daarop te skryf. +af_za.text.write_done=Die prent is op die bordjie geskryf. +af_za.text.ffmpeg_missing=FFmpeg is nodig om video's en klank te speel. + +ar_sa.text.write_mode=ضع لافتة لكتابة الصورة عليها. +ar_sa.text.write_done=تمت كتابة الصورة على اللافتة. +ar_sa.text.ffmpeg_missing=يلزم FFmpeg لتشغيل الفيديو والصوت. + +ast_es.text.write_mode=Pon un cartelu pa escribir la imaxe nelli. +ast_es.text.write_done=La imaxe escribióse nel cartelu. +ast_es.text.ffmpeg_missing=Precísase FFmpeg pa reproducir vídeos y audiu. + +az_az.text.write_mode=Şəkli yazmaq üçün lövhə qoyun. +az_az.text.write_done=Şəkil lövhəyə yazıldı. +az_az.text.ffmpeg_missing=Video və səsi oxutmaq üçün FFmpeg tələb olunur. + +be_by.text.write_mode=Пастаўце таблічку, каб запісаць на яе выяву. +be_by.text.write_done=Выява запісана на таблічку. +be_by.text.ffmpeg_missing=Для прайгравання відэа і гуку патрэбен FFmpeg. + +bg_bg.text.write_mode=Поставете табела, за да запишете изображението върху нея. +bg_bg.text.write_done=Изображението беше записано върху табелата. +bg_bg.text.ffmpeg_missing=За възпроизвеждане на видео и звук е необходим FFmpeg. + +bs_ba.text.write_mode=Postavite znak da biste na njega upisali sliku. +bs_ba.text.write_done=Slika je upisana na znak. +bs_ba.text.ffmpeg_missing=Za reprodukciju videa i zvuka potreban je FFmpeg. + +ca_es.text.write_mode=Col·loca un cartell per escriure-hi la imatge. +ca_es.text.write_done=La imatge s'ha escrit al cartell. +ca_es.text.ffmpeg_missing=Cal FFmpeg per reproduir vídeos i àudio. + +cs_cz.text.write_mode=Položte cedulku a obrázek se na ni zapíše. +cs_cz.text.write_done=Obrázek byl zapsán na cedulku. +cs_cz.text.ffmpeg_missing=K přehrávání videa a zvuku je potřeba FFmpeg. + +cy_gb.text.write_mode=Gosodwch arwydd i ysgrifennu'r ddelwedd arno. +cy_gb.text.write_done=Ysgrifennwyd y ddelwedd ar yr arwydd. +cy_gb.text.ffmpeg_missing=Mae angen FFmpeg i chwarae fideo a sain. + +da_dk.text.write_mode=Placer et skilt for at skrive billedet på det. +da_dk.text.write_done=Billedet blev skrevet på skiltet. +da_dk.text.ffmpeg_missing=FFmpeg er påkrævet for at afspille video og lyd. + +de_de.text.write_mode=Platziere ein Schild, um das Bild darauf zu schreiben. +de_de.text.write_done=Das Bild wurde auf das Schild geschrieben. +de_de.text.ffmpeg_missing=Zum Abspielen von Videos und Audio wird FFmpeg benötigt. + +el_gr.text.write_mode=Τοποθετήστε μια πινακίδα για να γραφτεί η εικόνα πάνω της. +el_gr.text.write_done=Η εικόνα γράφτηκε στην πινακίδα. +el_gr.text.ffmpeg_missing=Απαιτείται το FFmpeg για την αναπαραγωγή βίντεο και ήχου. + +en_ud.text.write_mode=˙ʇı uo ǝƃɐɯı ǝɥʇ ǝʇıɹʍ oʇ uƃıs ɐ ǝɔɐlԀ +en_ud.text.write_done=˙uƃıs ǝɥʇ oʇ uǝʇʇıɹʍ sɐʍ ǝƃɐɯı ǝɥ⊥ +en_ud.text.ffmpeg_missing=˙oıpnɐ puɐ soǝpıʌ ʎɐld oʇ pǝɹınbǝɹ sı ƃǝdɯℲℲ + +en_pt.text.write_mode=Plant a sign, matey, to scribe the picture on it. +en_pt.text.write_done=The picture be scribed upon the sign. Arr! +en_pt.text.ffmpeg_missing=Ye be needin' FFmpeg to play movin' pictures an' sounds. + +enws.text.write_mode=Set thou a sign, that the image be writ upon it. +enws.text.write_done=The image hath been writ upon the sign. +enws.text.ffmpeg_missing=FFmpeg is needful to play moving pictures and sounds. + +lol_us.text.write_mode=PLACE A SINE 2 RITE TEH PIKCHUR ON IT. +lol_us.text.write_done=TEH PIKCHUR WUZ RITTEN ON TEH SINE. +lol_us.text.ffmpeg_missing=U NEEDZ FFmpeg 2 PLAI VIDEOZ AN SOUNDZ. + +eo_uy.text.write_mode=Metu ŝildon por skribi la bildon sur ĝin. +eo_uy.text.write_done=La bildo estis skribita sur la ŝildon. +eo_uy.text.ffmpeg_missing=FFmpeg estas bezonata por ludi videojn kaj sonon. + +es_es.text.write_mode=Coloca un cartel para escribir la imagen en él. +es_es.text.write_done=La imagen se ha escrito en el cartel. +es_es.text.ffmpeg_missing=Se necesita FFmpeg para reproducir vídeos y audio. + +et_ee.text.write_mode=Aseta silt, et pilt sellele kirjutada. +et_ee.text.write_done=Pilt kirjutati sildile. +et_ee.text.ffmpeg_missing=Video ja heli esitamiseks on vaja FFmpegi. + +eu_es.text.write_mode=Jarri kartel bat irudia bertan idazteko. +eu_es.text.write_done=Irudia kartelean idatzi da. +eu_es.text.ffmpeg_missing=FFmpeg behar da bideoak eta audioa erreproduzitzeko. + +fa_ir.text.write_mode=برای نوشتن تصویر، یک تابلو قرار دهید. +fa_ir.text.write_done=تصویر روی تابلو نوشته شد. +fa_ir.text.ffmpeg_missing=برای پخش ویدیو و صدا به FFmpeg نیاز است. + +fi_fi.text.write_mode=Aseta kyltti, niin kuva kirjoitetaan siihen. +fi_fi.text.write_done=Kuva kirjoitettiin kylttiin. +fi_fi.text.ffmpeg_missing=Videoiden ja äänen toistamiseen tarvitaan FFmpeg. + +fil_ph.text.write_mode=Maglagay ng karatula upang maisulat dito ang larawan. +fil_ph.text.write_done=Naisulat na ang larawan sa karatula. +fil_ph.text.ffmpeg_missing=Kailangan ang FFmpeg upang mapatugtog ang mga video at audio. + +fo_fo.text.write_mode=Set upp eitt skelti fyri at skriva myndina á tað. +fo_fo.text.write_done=Myndin varð skrivað á skeltið. +fo_fo.text.ffmpeg_missing=FFmpeg er neyðugt fyri at spæla video og ljóð. + +fr_fr.text.write_mode=Placez une pancarte pour y écrire l'image. +fr_fr.text.write_done=L'image a été écrite sur la pancarte. +fr_fr.text.ffmpeg_missing=FFmpeg est nécessaire pour lire les vidéos et l'audio. + +fy_nl.text.write_mode=Pleats in boerd om de ôfbylding derop te skriuwen. +fy_nl.text.write_done=De ôfbylding is op it boerd skreaun. +fy_nl.text.ffmpeg_missing=FFmpeg is nedich om fideo's en lûd ôf te spyljen. + +ga_ie.text.write_mode=Cuir comhartha síos chun an íomhá a scríobh air. +ga_ie.text.write_done=Scríobhadh an íomhá ar an gcomhartha. +ga_ie.text.ffmpeg_missing=Tá FFmpeg ag teastáil chun físeáin agus fuaim a sheinm. + +gd_gb.text.write_mode=Cuir soidhne sìos gus an dealbh a sgrìobhadh air. +gd_gb.text.write_done=Chaidh an dealbh a sgrìobhadh air an t-soidhne. +gd_gb.text.ffmpeg_missing=Tha FFmpeg a dhìth gus bhidiothan agus fuaim a chluich. + +gl_es.text.write_mode=Coloca un cartel para escribir a imaxe nel. +gl_es.text.write_done=A imaxe escribiuse no cartel. +gl_es.text.ffmpeg_missing=Precísase FFmpeg para reproducir vídeos e audio. + +he_il.text.write_mode=הניחו שלט כדי לכתוב עליו את התמונה. +he_il.text.write_done=התמונה נכתבה על השלט. +he_il.text.ffmpeg_missing=נדרש FFmpeg כדי לנגן וידאו ושמע. + +hi_in.text.write_mode=चित्र लिखने के लिए एक साइन बोर्ड रखें। +hi_in.text.write_done=चित्र साइन बोर्ड पर लिख दिया गया। +hi_in.text.ffmpeg_missing=वीडियो और ऑडियो चलाने के लिए FFmpeg आवश्यक है। + +hr_hr.text.write_mode=Postavite znak kako biste na njega upisali sliku. +hr_hr.text.write_done=Slika je upisana na znak. +hr_hr.text.ffmpeg_missing=Za reprodukciju videa i zvuka potreban je FFmpeg. + +hu_hu.text.write_mode=Helyezz le egy táblát, hogy a kép ráíródjon. +hu_hu.text.write_done=A kép felkerült a táblára. +hu_hu.text.ffmpeg_missing=A videók és hangok lejátszásához FFmpeg szükséges. + +hy_am.text.write_mode=Տեղադրեք ցուցանակ՝ պատկերը դրա վրա գրելու համար։ +hy_am.text.write_done=Պատկերը գրվեց ցուցանակի վրա։ +hy_am.text.ffmpeg_missing=Տեսանյութեր և ձայն նվագարկելու համար անհրաժեշտ է FFmpeg։ + +id_id.text.write_mode=Letakkan papan tanda untuk menuliskan gambar di atasnya. +id_id.text.write_done=Gambar telah ditulis pada papan tanda. +id_id.text.ffmpeg_missing=FFmpeg diperlukan untuk memutar video dan audio. + +is_is.text.write_mode=Settu niður skilti til að skrifa myndina á það. +is_is.text.write_done=Myndin var skrifuð á skiltið. +is_is.text.ffmpeg_missing=FFmpeg þarf til að spila myndbönd og hljóð. + +it_it.text.write_mode=Piazza un cartello per scriverci l'immagine. +it_it.text.write_done=L'immagine è stata scritta sul cartello. +it_it.text.ffmpeg_missing=Per riprodurre video e audio è necessario FFmpeg. + +ka_ge.text.write_mode=დადგით აბრა, რომ მასზე სურათი ჩაიწეროს. +ka_ge.text.write_done=სურათი აბრაზე ჩაიწერა. +ka_ge.text.ffmpeg_missing=ვიდეოსა და აუდიოს დასაკრავად საჭიროა FFmpeg. + +kk_kz.text.write_mode=Суретті жазу үшін тақтайша қойыңыз. +kk_kz.text.write_done=Сурет тақтайшаға жазылды. +kk_kz.text.ffmpeg_missing=Бейне мен дыбысты ойнату үшін FFmpeg қажет. + +kn_in.text.write_mode=ಚಿತ್ರವನ್ನು ಬರೆಯಲು ಒಂದು ಫಲಕವನ್ನು ಇರಿಸಿ. +kn_in.text.write_done=ಚಿತ್ರವನ್ನು ಫಲಕದ ಮೇಲೆ ಬರೆಯಲಾಗಿದೆ. +kn_in.text.ffmpeg_missing=ವೀಡಿಯೊ ಮತ್ತು ಆಡಿಯೊ ಪ್ಲೇ ಮಾಡಲು FFmpeg ಅಗತ್ಯವಿದೆ. + +ko_kr.text.write_mode=표지판을 설치하면 이미지가 기록됩니다. +ko_kr.text.write_done=표지판에 이미지를 기록했습니다. +ko_kr.text.ffmpeg_missing=동영상과 오디오를 재생하려면 FFmpeg가 필요합니다. + +la_la.text.write_mode=Pone signum ut imago in eo scribatur. +la_la.text.write_done=Imago in signo scripta est. +la_la.text.ffmpeg_missing=FFmpeg requiritur ad pelliculas et sonos reddendos. + +lb_lu.text.write_mode=Plazéier e Schëld, fir d'Bild drop ze schreiwen. +lb_lu.text.write_done=D'Bild gouf op d'Schëld geschriwwen. +lb_lu.text.ffmpeg_missing=FFmpeg gëtt gebraucht, fir Videoen an Audio ofzespillen. + +lo_la.text.write_mode=ວາງປ້າຍເພື່ອຂຽນຮູບພາບລົງໃສ່. +lo_la.text.write_done=ຂຽນຮູບພາບລົງໃສ່ປ້າຍແລ້ວ. +lo_la.text.ffmpeg_missing=ຕ້ອງມີ FFmpeg ເພື່ອຫຼິ້ນວິດີໂອ ແລະ ສຽງ. + +lt_lt.text.write_mode=Pastatykite ženklą, kad ant jo būtų įrašytas paveikslėlis. +lt_lt.text.write_done=Paveikslėlis įrašytas ant ženklo. +lt_lt.text.ffmpeg_missing=Vaizdo įrašams ir garsui atkurti reikalinga FFmpeg. + +lv_lv.text.write_mode=Novietojiet zīmi, lai uz tās ierakstītu attēlu. +lv_lv.text.write_done=Attēls tika ierakstīts uz zīmes. +lv_lv.text.ffmpeg_missing=Video un audio atskaņošanai ir nepieciešams FFmpeg. + +mk_mk.text.write_mode=Поставете табла за да ја запишете сликата на неа. +mk_mk.text.write_done=Сликата е запишана на таблата. +mk_mk.text.ffmpeg_missing=За репродукција на видео и звук е потребен FFmpeg. + +mn_mn.text.write_mode=Зургийг бичихийн тулд самбар байрлуулна уу. +mn_mn.text.write_done=Зургийг самбар дээр бичлээ. +mn_mn.text.ffmpeg_missing=Видео болон дуу тоглуулахад FFmpeg шаардлагатай. + +ms_my.text.write_mode=Letakkan papan tanda untuk menulis imej padanya. +ms_my.text.write_done=Imej telah ditulis pada papan tanda. +ms_my.text.ffmpeg_missing=FFmpeg diperlukan untuk memainkan video dan audio. + +mt_mt.text.write_mode=Poġġi sinjal biex tikteb l-immaġni fuqu. +mt_mt.text.write_done=L-immaġni nkitbet fuq is-sinjal. +mt_mt.text.ffmpeg_missing=FFmpeg huwa meħtieġ biex jindaqqu vidjows u awdjo. + +nl_nl.text.write_mode=Plaats een bord om de afbeelding erop te schrijven. +nl_nl.text.write_done=De afbeelding is op het bord geschreven. +nl_nl.text.ffmpeg_missing=FFmpeg is vereist om video's en audio af te spelen. + +nn_no.text.write_mode=Plasser eit skilt for å skrive biletet på det. +nn_no.text.write_done=Biletet vart skrive på skiltet. +nn_no.text.ffmpeg_missing=FFmpeg krevst for å spele av video og lyd. + +no_no.text.write_mode=Plasser et skilt for å skrive bildet på det. +no_no.text.write_done=Bildet ble skrevet på skiltet. +no_no.text.ffmpeg_missing=FFmpeg kreves for å spille av video og lyd. + +pl_pl.text.write_mode=Postaw tabliczkę, aby zapisać na niej obraz. +pl_pl.text.write_done=Obraz został zapisany na tabliczce. +pl_pl.text.ffmpeg_missing=Do odtwarzania filmów i dźwięku wymagany jest FFmpeg. + +pt_br.text.write_mode=Coloque uma placa para escrever a imagem nela. +pt_br.text.write_done=A imagem foi escrita na placa. +pt_br.text.ffmpeg_missing=O FFmpeg é necessário para reproduzir vídeos e áudio. + +pt_pt.text.write_mode=Coloca uma tabuleta para escrever a imagem nela. +pt_pt.text.write_done=A imagem foi escrita na tabuleta. +pt_pt.text.ffmpeg_missing=O FFmpeg é necessário para reproduzir vídeos e áudio. + +ro_ro.text.write_mode=Plasează un semn pentru a scrie imaginea pe el. +ro_ro.text.write_done=Imaginea a fost scrisă pe semn. +ro_ro.text.ffmpeg_missing=FFmpeg este necesar pentru a reda videoclipuri și audio. + +ru_ru.text.write_mode=Поставьте табличку, чтобы записать на неё изображение. +ru_ru.text.write_done=Изображение записано на табличку. +ru_ru.text.ffmpeg_missing=Для воспроизведения видео и звука требуется FFmpeg. + +sk_sk.text.write_mode=Položte ceduľu a obrázok sa na ňu zapíše. +sk_sk.text.write_done=Obrázok bol zapísaný na ceduľu. +sk_sk.text.ffmpeg_missing=Na prehrávanie videa a zvuku je potrebný FFmpeg. + +sl_si.text.write_mode=Postavite tablo, da nanjo zapišete sliko. +sl_si.text.write_done=Slika je bila zapisana na tablo. +sl_si.text.ffmpeg_missing=Za predvajanje videa in zvoka je potreben FFmpeg. + +sq_al.text.write_mode=Vendos një tabelë për të shkruar imazhin mbi të. +sq_al.text.write_done=Imazhi u shkrua në tabelë. +sq_al.text.ffmpeg_missing=Nevojitet FFmpeg për të luajtur video dhe audio. + +sr_sp.text.write_mode=Поставите знак да бисте на њега уписали слику. +sr_sp.text.write_done=Слика је уписана на знак. +sr_sp.text.ffmpeg_missing=За репродукцију видеа и звука потребан је FFmpeg. + +sr_cs.text.write_mode=Postavite znak da biste na njega upisali sliku. +sr_cs.text.write_done=Slika je upisana na znak. +sr_cs.text.ffmpeg_missing=Za reprodukciju videa i zvuka potreban je FFmpeg. + +sv_se.text.write_mode=Placera en skylt för att skriva bilden på den. +sv_se.text.write_done=Bilden skrevs på skylten. +sv_se.text.ffmpeg_missing=FFmpeg krävs för att spela upp video och ljud. + +ta_in.text.write_mode=படத்தை எழுத ஒரு பலகையை வையுங்கள். +ta_in.text.write_done=படம் பலகையில் எழுதப்பட்டது. +ta_in.text.ffmpeg_missing=வீடியோ மற்றும் ஆடியோவை இயக்க FFmpeg தேவை. + +th_th.text.write_mode=วางป้ายเพื่อเขียนรูปภาพลงบนป้าย +th_th.text.write_done=เขียนรูปภาพลงบนป้ายแล้ว +th_th.text.ffmpeg_missing=ต้องใช้ FFmpeg เพื่อเล่นวิดีโอและเสียง + +tr_tr.text.write_mode=Resmi yazmak için bir tabela yerleştirin. +tr_tr.text.write_done=Resim tabelaya yazıldı. +tr_tr.text.ffmpeg_missing=Video ve ses oynatmak için FFmpeg gereklidir. + +tt_ru.text.write_mode=Рәсемне язу өчен такта куегыз. +tt_ru.text.write_done=Рәсем тактага язылды. +tt_ru.text.ffmpeg_missing=Видео һәм тавышны уйнату өчен FFmpeg кирәк. + +uk_ua.text.write_mode=Поставте табличку, щоб записати на неї зображення. +uk_ua.text.write_done=Зображення записано на табличку. +uk_ua.text.ffmpeg_missing=Для відтворення відео та звуку потрібен FFmpeg. + +vi_vn.text.write_mode=Đặt một tấm biển để ghi hình ảnh lên đó. +vi_vn.text.write_done=Hình ảnh đã được ghi lên tấm biển. +vi_vn.text.ffmpeg_missing=Cần có FFmpeg để phát video và âm thanh. + +zh_cn.text.write_mode=放置告示牌即可将图片写入其中。 +zh_cn.text.write_done=图片已写入告示牌。 +zh_cn.text.ffmpeg_missing=播放视频和音频需要 FFmpeg。 + +zh_tw.text.write_mode=放置告示牌即可將圖片寫入其中。 +zh_tw.text.write_done=圖片已寫入告示牌。 +zh_tw.text.ffmpeg_missing=播放影片和音訊需要 FFmpeg。 + +lzh.text.write_mode=置告示牌,則圖書於其上。 +lzh.text.write_done=圖已書於告示牌。 +lzh.text.ffmpeg_missing=欲觀影聽音,須備 FFmpeg。 + +# ---------- 近い言語への割り当て ---------- +alias.en_au=en_us +alias.en_ca=en_us +alias.en_gb=en_us +alias.en_nz=en_us +alias.enp=en_us +alias.kw_gb=en_us +alias.haw_us=en_us +alias.es_ar=es_es +alias.es_cl=es_es +alias.es_ec=es_es +alias.es_mx=es_es +alias.es_uy=es_es +alias.es_ve=es_es +alias.esan=es_es +alias.val_es=ca_es +alias.de_at=de_de +alias.de_ch=de_de +alias.bar=de_de +alias.fra_de=de_de +alias.ksh=de_de +alias.nds_de=de_de +alias.sxu=de_de +alias.fr_ca=fr_fr +alias.br_fr=fr_fr +alias.oc_fr=fr_fr +alias.nl_be=nl_nl +alias.brb=nl_nl +alias.li_li=nl_nl +alias.fur_it=it_it +alias.lmo=it_it +alias.vec_it=it_it +alias.nb_no=no_no +alias.se_no=no_no +alias.ovd=sv_se +alias.tl_ph=fil_ph +alias.zh_hk=zh_tw +alias.zlm_arab=ms_my +alias.ry_ua=uk_ua +alias.ba_ru=ru_ru +alias.rpr=ru_ru +alias.sah_sah=ru_ru +alias.szl=pl_pl +alias.isv=sr_cs diff --git a/core/src/main/resources/marumasa_sign/lang/en_us.properties b/core/src/main/resources/marumasa_sign/lang/en_us.properties new file mode 100644 index 00000000..81b2249a --- /dev/null +++ b/core/src/main/resources/marumasa_sign/lang/en_us.properties @@ -0,0 +1,39 @@ +ui.group.image=File +ui.source=File or URL (image, video, audio or 3D model): +ui.browse=Browse... +ui.drop_hint=You can also drop a file onto this window. +ui.group.size=Size +ui.width=Width +ui.height=Height +ui.group.position=Position +ui.group.rotation=Rotation +ui.group.settings=Settings +ui.threads=Simultaneous image loads +ui.clear_cache=Delete cache +ui.volume=Video and audio volume +ui.group.preview=Preview +ui.preview.none=No image +ui.preview.model=3D model, %d triangles +ui.preview.loading=Loading... +ui.preview.failed=Cannot show a preview +ui.place=Write to sign +ui.cancel=Cancel + +ui.status.ready=Choose a file, then press "Write to sign". +ui.status.no_source=Choose an image file or enter a URL. +ui.status.not_in_world=Join a world first. +ui.status.file_not_found=File not found: %s +ui.status.file_too_large=The file is larger than %d MB. +ui.status.not_image=This file is not a supported image, video, audio or 3D model. +ui.status.uploading=Uploading the image... +ui.status.upload_failed=Upload failed: %s +ui.status.shortening=Shortening the URL... +ui.status.too_long=The text does not fit on a sign (%d / %d characters). +ui.status.cache_cleared=The image cache has been deleted. +ui.status.cache_busy=Images are still loading. Try again later. + +browser.title=Choose a file +browser.location=Folder: +browser.up=Up +browser.open=Open +browser.filter=Images, videos, audio files and 3D models diff --git a/core/src/main/resources/marumasa_sign/lang/ja_jp.properties b/core/src/main/resources/marumasa_sign/lang/ja_jp.properties new file mode 100644 index 00000000..f953553e --- /dev/null +++ b/core/src/main/resources/marumasa_sign/lang/ja_jp.properties @@ -0,0 +1,39 @@ +ui.group.image=ファイル +ui.source=ファイルまたは URL (画像・動画・音声・3D モデル): +ui.browse=参照... +ui.drop_hint=ファイルをこのウィンドウにドロップすることもできます。 +ui.group.size=大きさ +ui.width=横幅 +ui.height=高さ +ui.group.position=位置 +ui.group.rotation=回転 +ui.group.settings=設定 +ui.threads=画像の同時ロード数 +ui.clear_cache=キャッシュを削除する +ui.volume=動画と音声の音量 +ui.group.preview=プレビュー +ui.preview.none=画像なし +ui.preview.model=3D モデル (三角形 %d 枚) +ui.preview.loading=読み込み中... +ui.preview.failed=プレビューを表示できません +ui.place=看板に書き込む +ui.cancel=キャンセル + +ui.status.ready=ファイルを選んで「看板に書き込む」を押してください。 +ui.status.no_source=画像ファイルを選ぶか、URL を入力してください。 +ui.status.not_in_world=先にワールドに入ってください。 +ui.status.file_not_found=ファイルが見つかりません: %s +ui.status.file_too_large=ファイルが %d MB を超えています。 +ui.status.not_image=対応していない形式のファイルです。 +ui.status.uploading=画像をアップロードしています... +ui.status.upload_failed=アップロードに失敗しました: %s +ui.status.shortening=URL を短縮しています... +ui.status.too_long=看板に入りきりません (%d / %d 文字)。 +ui.status.cache_cleared=画像のキャッシュを削除しました。 +ui.status.cache_busy=画像の読み込み中です。しばらくしてからもう一度お試しください。 + +browser.title=ファイルを選択 +browser.location=フォルダ: +browser.up=上へ +browser.open=開く +browser.filter=画像・動画・音声・3D モデル diff --git a/src/main/resources/assets/marumasa_sign/textures/misc/loading.png b/core/src/main/resources/marumasa_sign/loading.png similarity index 100% rename from src/main/resources/assets/marumasa_sign/textures/misc/loading.png rename to core/src/main/resources/marumasa_sign/loading.png diff --git a/core/src/test/java/marumasa/marumasa_sign/core/FakePlatform.java b/core/src/test/java/marumasa/marumasa_sign/core/FakePlatform.java new file mode 100644 index 00000000..28972f29 --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/FakePlatform.java @@ -0,0 +1,140 @@ +package marumasa.marumasa_sign.core; + +import java.io.File; +import java.util.concurrent.ConcurrentLinkedQueue; + +/** + * Minecraft の代わりをする、確認用の Platform。 + * テクスチャは最後に作成・更新された内容だけを覚えている。 + */ +final class FakePlatform implements Platform { + + private final String language; + // メインスレッドで実行する処理。runTasks で実行する + private final ConcurrentLinkedQueue tasks = new ConcurrentLinkedQueue(); + + int[] pixels; + int width, height; + int textureCount; + + // 作成したテクスチャの内容 + public static final class Texture { + public final int width, height; + public int[] pixels; + + Texture(int width, int height, int[] pixels) { + this.width = width; + this.height = height; + this.pixels = pixels; + } + } + int updateCount; + + FakePlatform(String language) { + this.language = language; + } + + // execute で渡された処理を、呼び出したスレッドで実行する + void runTasks() { + Runnable task; + while ((task = tasks.poll()) != null) { + task.run(); + } + } + + @Override + public String minecraftVersion() { + return "preview"; + } + + @Override + public String loaderName() { + return "preview"; + } + + @Override + public File gameDirectory() { + return new File(System.getProperty("java.io.tmpdir"), "marumasign-preview"); + } + + @Override + public String languageCode() { + return language; + } + + @Override + public void execute(Runnable task) { + tasks.add(task); + } + + @Override + public void showMessage(String message) { + System.out.println("[chat] " + message); + } + + @Override + public boolean isInWorld() { + return true; + } + + @Override + public int maxSignLineLength() { + return 80; + } + + @Override + public Object createTexture(int width, int height, int[] argb) { + this.pixels = argb.clone(); + this.width = width; + this.height = height; + textureCount++; + return new Texture(width, height, this.pixels); + } + + @Override + public void updateTexture(Object texture, int width, int height, int[] argb) { + this.pixels = argb.clone(); + ((Texture) texture).pixels = this.pixels; + this.width = width; + this.height = height; + updateCount++; + } + + @Override + public void releaseTexture(Object texture) { + } + + @Override + public void openUi() { + } + + @Override + public void closeUi() { + } + + @Override + public boolean supportsFileDrop() { + return true; + } + + @Override + public String getClipboard() { + return ""; + } + + @Override + public void setClipboard(String text) { + } + + @Override + public void selfTestLook(float pitch) { + } + + @Override + public void selfTestUseItem() { + } + + @Override + public void quit() { + } +} diff --git a/core/src/test/java/marumasa/marumasa_sign/core/HttpCheck.java b/core/src/test/java/marumasa/marumasa_sign/core/HttpCheck.java new file mode 100644 index 00000000..64220027 --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/HttpCheck.java @@ -0,0 +1,31 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.net.Http; + +/** + * 実際のサーバーとの通信を確かめるための道具。 + * 古い Java (Minecraft 1.12.2 以前に付属するもの) でも HTTPS で接続できるかを調べるのに使う。 + * 引数: 取得する URL (複数可) + */ +public final class HttpCheck { + + public static void main(String[] args) { + System.out.println("java.version=" + System.getProperty("java.version")); + for (String url : args) { + if (url.startsWith("shorten:")) { + try { + System.out.println("OK shorten -> " + Http.shorten(url.substring("shorten:".length()))); + } catch (Exception e) { + System.out.println("FAIL shorten -> " + e); + } + continue; + } + try { + final byte[] body = Http.download(url); + System.out.println("OK " + url + " (" + body.length + " bytes)"); + } catch (Exception e) { + System.out.println("FAIL " + url + " -> " + e); + } + } + } +} diff --git a/core/src/test/java/marumasa/marumasa_sign/core/MediaCheck.java b/core/src/test/java/marumasa/marumasa_sign/core/MediaCheck.java new file mode 100644 index 00000000..70b0b3e5 --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/MediaCheck.java @@ -0,0 +1,82 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.media.Ffmpeg; +import marumasa.marumasa_sign.core.media.MediaPlayer; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; + +/** + * Minecraft を起動せずに、動画や音声の再生を確かめるための道具。 + * 引数: URL, 再生する秒数, フレームを保存するフォルダ, 音量 (0 - 1) + */ +public final class MediaCheck { + + public static void main(String[] args) throws Exception { + final String url = args[0]; + final int seconds = args.length > 1 ? Integer.parseInt(args[1]) : 5; + final File output = new File(args.length > 2 ? args[2] : "."); + final float gain = args.length > 3 ? Float.parseFloat(args[3]) : 0f; + System.out.println("java.version=" + System.getProperty("java.version")); + System.out.println("ffmpeg available=" + Ffmpeg.isAvailable()); + + final int[] size = new int[2]; + final String[] failure = new String[1]; + final Object ready = new Object(); + final MediaPlayer player = new MediaPlayer(url, new MediaPlayer.Listener() { + @Override + public void onReady(int width, int height) { + synchronized (ready) { + size[0] = width; + size[1] = height; + ready.notifyAll(); + } + System.out.println("ready: " + width + "x" + height); + } + + @Override + public void onFailed(String reason) { + synchronized (ready) { + failure[0] = reason; + ready.notifyAll(); + } + System.out.println("failed: " + reason); + } + }); + player.setGain(gain); + final long start = System.nanoTime(); + player.start(); + synchronized (ready) { + while (size[0] == 0 && failure[0] == null && System.nanoTime() - start < 30_000_000_000L) ready.wait(100); + } + if (failure[0] != null) System.exit(1); + + // 描画のスレッドの代わりに、60 分の 1 秒ごとにフレームを取り出す + final boolean video = size[0] > 0; + final int[] pixels = new int[Math.max(1, size[0] * size[1])]; + int frames = 0; + int saved = 0; + final long begin = System.nanoTime(); + while (System.nanoTime() - begin < seconds * 1_000_000_000L) { + if (video && player.pollFrame(pixels)) { + frames++; + final double elapsed = (System.nanoTime() - begin) / 1e9; + if (saved < 3 && elapsed >= saved * 1.5) { + final BufferedImage image = new BufferedImage(size[0], size[1], BufferedImage.TYPE_INT_ARGB); + image.setRGB(0, 0, size[0], size[1], pixels, 0, size[0]); + final File file = new File(output, "frame-" + saved + ".png"); + ImageIO.write(image, "png", file); + System.out.println(String.format("saved %s at %.2fs", file.getName(), elapsed)); + saved++; + } + } + Thread.sleep(16); + } + final double elapsed = (System.nanoTime() - begin) / 1e9; + System.out.println(String.format("frames=%d in %.2fs (%.1f fps)", frames, elapsed, frames / elapsed)); + player.stop(); + System.out.println("stopped"); + System.exit(0); + } +} diff --git a/core/src/test/java/marumasa/marumasa_sign/core/SignMediaCheck.java b/core/src/test/java/marumasa/marumasa_sign/core/SignMediaCheck.java new file mode 100644 index 00000000..fa9dfa91 --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/SignMediaCheck.java @@ -0,0 +1,58 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.sign.SignImage; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; + +/** + * Minecraft を起動せずに、看板の文字列から画像・動画・音声が読み込まれて表示されるまでを確かめる道具。 + * 引数: URL, 動かす秒数, 最後のテクスチャを保存するファイル + */ +public final class SignMediaCheck { + + public static void main(String[] args) throws Exception { + final String url = args[0]; + final int seconds = args.length > 1 ? Integer.parseInt(args[1]) : 6; + final File output = args.length > 2 ? new File(args[2]) : null; + + final FakePlatform platform = new FakePlatform("en_us"); + MarumaSign.init(platform); + MarumaSign.config().setVolume(0); + final String text = url + "|0|0|0|1|1|0|0|0"; + + // ゲームと同じように、1 秒に 20 回の tick と 60 回の描画を行う + boolean loaded = false; + double loadedAt = 0; + final long begin = System.nanoTime(); + long nextTick = 0; + while (System.nanoTime() - begin < seconds * 1_000_000_000L) { + final long elapsed = (System.nanoTime() - begin) / 1_000_000; + if (elapsed >= nextTick) { + MarumaSign.tick(); + nextTick += 50; + } + platform.runTasks(); + final SignImage image = MarumaSign.sign(text); + if (image == null) throw new IllegalStateException("not a sign text"); + image.texture(4.0); + if (image.isLoaded() && !loaded) { + loaded = true; + loadedAt = elapsed / 1000.0; + } + Thread.sleep(16); + } + final SignImage image = MarumaSign.sign(text); + System.out.println(String.format("loaded=%s after %.2fs, size=%dx%d, textures=%d, updates=%d (%.1f per second)", + image.isLoaded(), loadedAt, image.textureEntry().width(), image.textureEntry().height(), + platform.textureCount, platform.updateCount, platform.updateCount / Math.max(0.1, seconds - loadedAt))); + if (output != null && platform.pixels != null) { + final BufferedImage picture = new BufferedImage(platform.width, platform.height, BufferedImage.TYPE_INT_ARGB); + picture.setRGB(0, 0, platform.width, platform.height, platform.pixels, 0, platform.width); + ImageIO.write(picture, "png", output); + } + MarumaSign.signs().clearCache(); + System.exit(0); + } +} diff --git a/core/src/test/java/marumasa/marumasa_sign/core/SignModelCheck.java b/core/src/test/java/marumasa/marumasa_sign/core/SignModelCheck.java new file mode 100644 index 00000000..ebb542bb --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/SignModelCheck.java @@ -0,0 +1,130 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.gltf.GltfPreview; +import marumasa.marumasa_sign.core.sign.SignImage; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; + +/** + * Minecraft を起動せずに、看板の文字列から画像や 3D モデルが読み込まれ、看板の位置に置かれるまでを確かめる道具。 + * 看板のあるブロックを、看板の正面の斜め上から見た絵を PNG に書き出す。 + * 引数: 看板の文字列 (URL だけでもよい), 看板の向き (度), 壁掛けなら wall, 出力ファイル, [アニメーションを進める秒数] + */ +public final class SignModelCheck { + + private static final int SIZE = 512; + // 1 ブロックの大きさ (画面の半分を 1 としたとき) + private static final float ZOOM = 0.45f; + + public static void main(String[] args) throws Exception { + final String text = args[0].contains("|") ? args[0] : args[0] + "|0|0|0|1|1|0|0|0"; + final float yaw = Float.parseFloat(args[1]); + final boolean wall = "wall".equals(args[2]); + final File output = new File(args[3]); + final double seconds = args.length > 4 ? Double.parseDouble(args[4]) : 0; + + final FakePlatform platform = new FakePlatform("en_us"); + MarumaSign.init(platform); + MarumaSign.config().setVolume(0); + + SignImage image = null; + final long begin = System.nanoTime(); + long loadedAt = -1; + while (true) { + final long elapsed = (System.nanoTime() - begin) / 1_000_000; + MarumaSign.tick(); + platform.runTasks(); + image = MarumaSign.sign(text); + if (image == null) throw new IllegalStateException("not a sign text"); + image.batches(yaw, wall, 4.0); + if (image.isLoaded() && loadedAt < 0) loadedAt = elapsed; + if (loadedAt >= 0 && elapsed - loadedAt >= seconds * 1000) break; + if (image.textureEntry().state() == marumasa.marumasa_sign.core.sign.TextureEntry.ERROR) break; + if (elapsed > 60000) break; + Thread.sleep(16); + } + + final long start = System.nanoTime(); + final SignImage.Batch[] batches = image.batches(yaw, wall, 4.0); + final long built = System.nanoTime(); + int vertexCount = 0; + for (SignImage.Batch batch : batches) vertexCount += batch.vertexCount; + final float[] bounds = image.bounds(yaw, wall); + System.out.println(String.format( + "loaded=%s after %d ms, batches=%d, quads=%d, build %.2f ms, viewDistance=%.1f, bounds=[%.2f %.2f %.2f .. %.2f %.2f %.2f]", + image.isLoaded(), loadedAt, batches.length, vertexCount / 4, (built - start) / 1e6, image.viewDistance(), + bounds[0], bounds[1], bounds[2], bounds[3], bounds[4], bounds[5])); + + final int[] frame = new int[SIZE * SIZE]; + final float[] depth = new float[SIZE * SIZE]; + for (int i = 0; i < frame.length; i++) { + frame[i] = 0xFF9DB7D6; + depth[i] = Float.NEGATIVE_INFINITY; + } + + // 目印として、看板のあるブロックの床と、壁掛け看板なら背後の壁を描く + final double front = Math.toRadians(yaw); + final float fx = (float) -Math.sin(front), fz = (float) Math.cos(front); + final int[] white = {0xFFFFFFFF}; + plane(frame, depth, yaw, new float[]{0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1}, 0xFF5E8C3A, white); + if (wall) { + // 看板の背後 (正面の反対側) にあるブロックの面 + final float cx = 0.5f - fx * 0.5f, cz = 0.5f - fz * 0.5f; + final float sx = fz * 0.5f, sz = -fx * 0.5f; + plane(frame, depth, yaw, new float[]{cx - sx, 0, cz - sz, cx + sx, 0, cz + sz, + cx + sx, 1, cz + sz, cx - sx, 1, cz - sz}, 0xFF8A8A8A, white); + } + + for (SignImage.Batch batch : batches) { + final FakePlatform.Texture texture = (FakePlatform.Texture) batch.texture; + final float[] view = new float[batch.vertexCount * SignImage.Batch.STRIDE]; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + toView(batch.vertices[o], batch.vertices[o + 1], batch.vertices[o + 2], yaw, view, o); + view[o + 3] = batch.vertices[o + 3]; + view[o + 4] = batch.vertices[o + 4]; + } + GltfPreview.draw(frame, depth, SIZE, view, batch.colors, batch.vertexCount, + texture.width, texture.height, texture.pixels, false); + } + + final BufferedImage picture = new BufferedImage(SIZE, SIZE, BufferedImage.TYPE_INT_RGB); + picture.setRGB(0, 0, SIZE, SIZE, frame, 0, SIZE); + ImageIO.write(picture, "png", output); + MarumaSign.signs().clearCache(); + System.exit(image.isLoaded() ? 0 : 1); + } + + // 4 つの角 (x, y, z) で指定した面を、両側から見えるように描く + private static void plane(int[] frame, float[] depth, float yaw, float[] corners, int color, int[] white) { + final float[] view = new float[8 * SignImage.Batch.STRIDE]; + final int[] colors = new int[8]; + for (int i = 0; i < 8; i++) { + final int corner = i < 4 ? i : 7 - i; + toView(corners[corner * 3], corners[corner * 3 + 1], corners[corner * 3 + 2], yaw, view, i * SignImage.Batch.STRIDE); + colors[i] = color; + } + GltfPreview.draw(frame, depth, SIZE, view, colors, 8, 1, 1, white, false); + } + + // ブロックの角を原点とした座標を、看板の正面の斜め上から見た画面の座標にする + private static void toView(float x, float y, float z, float yaw, float[] out, int offset) { + x -= 0.5f; + y -= 0.5f; + z -= 0.5f; + // 看板の正面を手前に向けてから、横に 30 度、上に 20 度回り込む + final double a = Math.toRadians(yaw - 30); + final float cos = (float) Math.cos(a), sin = (float) Math.sin(a); + final float rx = x * cos + z * sin; + final float rz = -x * sin + z * cos; + final double p = Math.toRadians(20); + final float cosP = (float) Math.cos(p), sinP = (float) Math.sin(p); + final float ry = y * cosP - rz * sinP; + final float depth = y * sinP + rz * cosP; + out[offset] = rx * ZOOM; + out[offset + 1] = ry * ZOOM; + out[offset + 2] = depth; + } +} diff --git a/core/src/test/java/marumasa/marumasa_sign/core/UiPreview.java b/core/src/test/java/marumasa/marumasa_sign/core/UiPreview.java new file mode 100644 index 00000000..1776cd9f --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/UiPreview.java @@ -0,0 +1,54 @@ +package marumasa.marumasa_sign.core; + +import marumasa.marumasa_sign.core.ui.Key; +import marumasa.marumasa_sign.core.ui.UiRoot; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; + +/** + * Minecraft を起動せずに画面の見た目を確認するための道具。 + * 引数: 出力先フォルダ, 言語コード, 拡大率 + */ +public final class UiPreview { + + private static void save(FakePlatform platform, UiRoot ui, File file) throws Exception { + platform.runTasks(); + ui.texture(); + final BufferedImage image = new BufferedImage(platform.width, platform.height, BufferedImage.TYPE_INT_ARGB); + image.setRGB(0, 0, platform.width, platform.height, platform.pixels, 0, platform.width); + ImageIO.write(image, "png", file); + System.out.println("Wrote " + file); + } + + public static void main(String[] args) throws Exception { + final File output = new File(args[0]); + final String language = args.length > 1 ? args[1] : "ja_jp"; + final int scale = args.length > 2 ? Integer.parseInt(args[2]) : 2; + if (!output.isDirectory() && !output.mkdirs()) throw new IllegalStateException("Cannot create " + output); + + final FakePlatform platform = new FakePlatform(language); + MarumaSign.init(platform); + final UiRoot ui = MarumaSign.ui(); + ui.opened(); + ui.layout(UiRoot.WIDTH * scale, UiRoot.HEIGHT * scale); + save(platform, ui, new File(output, "main-" + language + ".png")); + + // 画像を指定した状態 + if (args.length > 3) { + ui.mainPage().setSource(args[3]); + for (int i = 0; i < 40; i++) { + MarumaSign.tick(); + platform.runTasks(); + Thread.sleep(50); + } + save(platform, ui, new File(output, "main-image-" + language + ".png")); + } + + // ファイル選択画面 (参照ボタンまで Tab で移動して押す) + ui.keyPressed(Key.TAB, 0); + ui.keyPressed(Key.ENTER, 0); + save(platform, ui, new File(output, "browser-" + language + ".png")); + } +} diff --git a/core/src/test/java/marumasa/marumasa_sign/core/gltf/GltfCheck.java b/core/src/test/java/marumasa/marumasa_sign/core/gltf/GltfCheck.java new file mode 100644 index 00000000..099b887c --- /dev/null +++ b/core/src/test/java/marumasa/marumasa_sign/core/gltf/GltfCheck.java @@ -0,0 +1,82 @@ +package marumasa.marumasa_sign.core.gltf; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; + +/** + * Minecraft を起動せずに、glTF のモデルを PNG に描いて確かめる。 + * 引数: 出力先のフォルダ, 時刻 (秒), モデルのファイル... + * 外部ファイルを参照している .gltf は、1 つの .glb にまとめたものでも同じ絵になるかを確かめる。 + */ +public final class GltfCheck { + + public static final int FRAME_SIZE = 512; + + private GltfCheck() { + } + + public static void main(String[] args) throws Exception { + final File outDir = new File(args[0]); + outDir.mkdirs(); + final float time = Float.parseFloat(args[1]); + int failures = 0; + for (int i = 2; i < args.length; i++) { + final File file = new File(args[i]); + try { + final long start = System.nanoTime(); + final byte[] content = Files.readAllBytes(file.toPath()); + final GltfModel model = GltfLoader.load(content, resources(file)); + final GltfScene scene = new GltfScene(model); + final long loaded = System.nanoTime(); + final int[] frame = render(scene, time); + final long drawn = System.nanoTime(); + final String name = file.getName().replace('.', '_') + ".png"; + final BufferedImage image = new BufferedImage(FRAME_SIZE, FRAME_SIZE, BufferedImage.TYPE_INT_RGB); + image.setRGB(0, 0, FRAME_SIZE, FRAME_SIZE, frame, 0, FRAME_SIZE); + ImageIO.write(image, "png", new File(outDir, name)); + + String packed = ""; + if (!GltfLoader.isGlb(content, content.length)) { + final byte[] glb = GltfPacker.pack(content, resources(file)); + final int[] again = render(new GltfScene(GltfLoader.load(glb, null)), time); + packed = java.util.Arrays.equals(frame, again) ? ", packed GLB matches" : ", PACKED GLB DIFFERS"; + if (!java.util.Arrays.equals(frame, again)) failures++; + } + System.out.println("OK " + file.getName() + ": " + model.triangleCount() + " triangles, " + + model.textureCount() + " textures (" + model.bakedCount() + " baked), " + scene.groups().length + + " groups, animated=" + + scene.isAnimated() + ", load " + (loaded - start) / 1000000 + " ms, draw " + + (drawn - loaded) / 1000000 + " ms" + packed); + } catch (IOException e) { + failures++; + System.out.println("FAIL " + file.getName() + ": " + e.getMessage()); + } + } + if (failures > 0) System.exit(1); + } + + private static GltfLoader.Resources resources(final File file) { + return new GltfLoader.Resources() { + @Override + public byte[] load(String uri) throws IOException { + return Files.readAllBytes(new File(file.getParentFile(), uri).toPath()); + } + }; + } + + private static int[] render(GltfScene scene, float time) { + final int[] frame = new int[FRAME_SIZE * FRAME_SIZE]; + final float[] depth = new float[FRAME_SIZE * FRAME_SIZE]; + for (int i = 0; i < frame.length; i++) { + // 透明な部分が分かるように、市松模様の背景にする + final boolean dark = (((i % FRAME_SIZE) >> 5) + ((i / FRAME_SIZE) >> 5)) % 2 == 0; + frame[i] = dark ? 0xFF6E7F8D : 0xFF8494A1; + depth[i] = Float.NEGATIVE_INFINITY; + } + GltfPreview.render(scene, time, FRAME_SIZE, frame, depth); + return frame; + } +} diff --git a/dist/build.gradle b/dist/build.gradle new file mode 100644 index 00000000..4cbeb207 --- /dev/null +++ b/dist/build.gradle @@ -0,0 +1,246 @@ +import org.objectweb.asm.ClassReader +import org.objectweb.asm.ClassWriter +import org.objectweb.asm.commons.ClassRemapper +import org.objectweb.asm.commons.Remapper + +import java.util.zip.ZipFile + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'org.ow2.asm:asm-commons:9.8' + } +} + +plugins { + id 'base' +} + +base { + archivesName = 'MarumaSign' +} + +def basePackage = 'marumasa/marumasa_sign' +def targets = rootProject.marumaTargets +targets.each { evaluationDependsOn(":targets:${it.name}") } +evaluationDependsOn(':core') +evaluationDependsOn(':bootstrap') + +/** + * jar の中のクラスを、パッケージ名を変えて取り出す。 + * 同じ実装でもローダーごとに実行時の名前 (SRG / 公式 / intermediary) が違うため、 + * 1 つの jar に同居させるにはローダーごとに別のパッケージへ移す必要がある。 + */ +abstract class RelocateJar extends DefaultTask { + @InputFile + abstract RegularFileProperty getInput() + + @Input + abstract Property getFromPrefix() + + @Input + abstract Property getToPrefix() + + @OutputDirectory + abstract DirectoryProperty getOutput() + + @TaskAction + void relocate() { + def outputDir = output.get().asFile + project.delete(outputDir) + outputDir.mkdirs() + + def from = fromPrefix.get() + def to = toPrefix.get() + def remapper = new Remapper() { + @Override + String map(String internalName) { + if (internalName == from || internalName.startsWith(from + '/')) { + return to + internalName.substring(from.length()) + } + return internalName + } + } + + new ZipFile(input.get().asFile).withCloseable { zip -> + zip.entries().each { entry -> + if (entry.directory || !entry.name.startsWith(from + '/') || !entry.name.endsWith('.class')) return + def reader = new ClassReader(zip.getInputStream(entry).bytes) + def writer = new ClassWriter(0) + reader.accept(new ClassRemapper(writer, remapper), 0) + def file = new File(outputDir, to + entry.name.substring(from.length())) + file.parentFile.mkdirs() + file.bytes = writer.toByteArray() + } + } + } +} + +// ---------- 統合 jar (Forge / NeoForge / Fabric) ---------- + +// 「ローダー.バージョン = 実装の名前」の対応表 +def tableLines = [] +def relocateTasks = [] + +targets.each { target -> + ['forge', 'neoforge'].each { loaderName -> + def loaderSpec = target.loaders[loaderName] + if (loaderSpec == null) return + loaderSpec.versions.each { tableLines << "${loaderName}.${it}=${target.name}" } + + def remapTask = project(":targets:${target.name}").tasks.named("remap${loaderName.capitalize()}Jar") + relocateTasks << tasks.register("relocate${loaderName.capitalize()}${target.name.capitalize()}", RelocateJar) { + input = remapTask.flatMap { it.archiveFile } + fromPrefix = "${basePackage}/adapter" + toPrefix = "${basePackage}/${loaderName}/${target.name}" + output = layout.buildDirectory.dir("relocated/${loaderName}/${target.name}") + } + } +} + +// Fabric は jar の中の jar を扱えるので、バージョンごとの実装をそのまま同梱し、 +// 実行中のバージョンに合うものだけを Fabric Loader に選ばせる +def fabricJars = [:] +targets.each { target -> + if (target.loaders.fabric == null) return + fabricJars["marumasa_sign-fabric-${target.name}.jar".toString()] = + project(":targets:${target.name}").tasks.named('remapFabricJar') +} + +def generateFabricMetadata = tasks.register('generateFabricMetadata') { + def outputDir = layout.buildDirectory.dir('generated/fabric') + def json = groovy.json.JsonOutput.prettyPrint(groovy.json.JsonOutput.toJson([ + schemaVersion: 1, + id : 'marumasa_sign', + version : project.version.toString(), + name : 'MarumaSign', + description : 'Display images on signs.', + authors : ['marumasa'], + contact : [repo: 'https://github.com/TORO-Server/MarumaSign'], + license : 'MIT', + icon : 'assets/marumasa_sign/icon.png', + environment : 'client', + jars : fabricJars.keySet().sort().collect { [file: "META-INF/jars/${it}".toString()] }, + ])) + inputs.property('json', json) + outputs.dir(outputDir) + doLast { + def file = new File(outputDir.get().asFile, 'fabric.mod.json') + file.parentFile.mkdirs() + file.setText(json + '\n', 'UTF-8') + } +} + +def generateTable = tasks.register('generateTable') { + def lines = tableLines.sort() + def outputDir = layout.buildDirectory.dir('generated/table') + inputs.property('lines', lines) + outputs.dir(outputDir) + doLast { + def file = new File(outputDir.get().asFile, 'marumasa_sign/targets.properties') + file.parentFile.mkdirs() + file.setText(lines.join('\n') + '\n', 'UTF-8') + } +} + +def resourceProperties = [version: project.version.toString()] + +def universalJar = tasks.register('universalJar', Jar) { + archiveVersion = project.version.toString() + destinationDirectory = layout.buildDirectory.dir('libs') + duplicatesStrategy = DuplicatesStrategy.FAIL + + from(project(':core').sourceSets.main.output) + from(project(':bootstrap').sourceSets.main.output) + relocateTasks.each { from(it) } + from(generateTable) + from(generateFabricMetadata) + fabricJars.each { name, task -> + from(task.flatMap { it.archiveFile }) { + into 'META-INF/jars' + rename { name } + } + } + + from('src/main/resources') { + inputs.properties(resourceProperties) + filesMatching(['mcmod.info', 'META-INF/mods.toml', 'META-INF/neoforge.mods.toml']) { + expand(resourceProperties) + } + } + // Minecraft 1.10.2 以前は言語ファイルの名前に大文字を使う + from('src/main/resources/assets/marumasa_sign/lang') { + include '*.lang' + into 'assets/marumasa_sign/lang' + rename { String name -> + def parts = name.replace('.lang', '').split('_') + "${parts[0]}_${parts[1].toUpperCase()}.lang" + } + } + from(rootProject.file('LICENSE')) { + rename { "${it}_marumasa_sign" } + } +} + +// ---------- LiteLoader 用 (.litemod はバージョンごとに 1 つ) ---------- + +def litemodTasks = [] +targets.each { target -> + def loaderSpec = target.loaders.liteloader + if (loaderSpec == null) return + def remapTask = project(":targets:${target.name}").tasks.named('remapLiteloaderJar') + + def metadata = tasks.register("litemodJson${target.name.capitalize()}") { + def outputDir = layout.buildDirectory.dir("generated/litemod/${target.name}") + def json = groovy.json.JsonOutput.prettyPrint(groovy.json.JsonOutput.toJson([ + name : 'MarumaSign', + mcversion : target.minecraft, + version : project.version.toString(), + revision : '1', + author : 'marumasa', + description: 'Display images on signs.', + url : 'https://github.com/TORO-Server/MarumaSign' + ])) + inputs.property('json', json) + outputs.dir(outputDir) + doLast { + def file = new File(outputDir.get().asFile, 'litemod.json') + file.parentFile.mkdirs() + file.setText(json + '\n', 'UTF-8') + } + } + + litemodTasks << tasks.register("litemod${target.name.capitalize()}", Jar) { + archiveVersion = project.version.toString() + archiveClassifier = "liteloader-mc${target.minecraft}" + archiveExtension = 'litemod' + destinationDirectory = layout.buildDirectory.dir('libs') + duplicatesStrategy = DuplicatesStrategy.FAIL + + from(project(':core').sourceSets.main.output) + from(remapTask.map { zipTree(it.archiveFile) }) { + include "${basePackage}/**" + } + from(metadata) + from('src/main/resources') { + include 'assets/**' + include 'pack.mcmeta' + } + from('src/main/resources/assets/marumasa_sign/lang') { + include '*.lang' + into 'assets/marumasa_sign/lang' + rename { String name -> + def parts = name.replace('.lang', '').split('_') + "${parts[0]}_${parts[1].toUpperCase()}.lang" + } + } + from(rootProject.file('LICENSE')) { + rename { "${it}_marumasa_sign" } + } + } +} + +assemble.dependsOn(universalJar) +litemodTasks.each { assemble.dependsOn(it) } diff --git a/dist/src/main/resources/META-INF/mods.toml b/dist/src/main/resources/META-INF/mods.toml new file mode 100644 index 00000000..1e2a0f2a --- /dev/null +++ b/dist/src/main/resources/META-INF/mods.toml @@ -0,0 +1,16 @@ +modLoader="javafml" +loaderVersion="[1,)" +license="MIT" +issueTrackerURL="https://github.com/TORO-Server/MarumaSign/issues" +clientSideOnly=true + +[[mods]] +modId="marumasa_sign" +version="${version}" +displayName="MarumaSign" +displayURL="https://github.com/TORO-Server/MarumaSign" +authors="marumasa" +displayTest="IGNORE_ALL_VERSION" +description=''' +Display images on signs. +''' \ No newline at end of file diff --git a/dist/src/main/resources/META-INF/neoforge.mods.toml b/dist/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 00000000..a4cc7d24 --- /dev/null +++ b/dist/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,14 @@ +modLoader="javafml" +loaderVersion="[1,)" +license="MIT" +issueTrackerURL="https://github.com/TORO-Server/MarumaSign/issues" + +[[mods]] +modId="marumasa_sign" +version="${version}" +displayName="MarumaSign" +displayURL="https://github.com/TORO-Server/MarumaSign" +authors="marumasa" +description=''' +Display images on signs. +''' \ No newline at end of file diff --git a/src/main/resources/assets/marumasa_sign/icon.png b/dist/src/main/resources/assets/marumasa_sign/icon.png similarity index 100% rename from src/main/resources/assets/marumasa_sign/icon.png rename to dist/src/main/resources/assets/marumasa_sign/icon.png diff --git a/dist/src/main/resources/assets/marumasa_sign/lang/en_us.json b/dist/src/main/resources/assets/marumasa_sign/lang/en_us.json new file mode 100644 index 00000000..1053d66d --- /dev/null +++ b/dist/src/main/resources/assets/marumasa_sign/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "key.marumasa_sign.open_menu": "Open MarumaSign" +} \ No newline at end of file diff --git a/dist/src/main/resources/assets/marumasa_sign/lang/en_us.lang b/dist/src/main/resources/assets/marumasa_sign/lang/en_us.lang new file mode 100644 index 00000000..658b87fc --- /dev/null +++ b/dist/src/main/resources/assets/marumasa_sign/lang/en_us.lang @@ -0,0 +1 @@ +key.marumasa_sign.open_menu=Open MarumaSign diff --git a/dist/src/main/resources/assets/marumasa_sign/lang/ja_jp.json b/dist/src/main/resources/assets/marumasa_sign/lang/ja_jp.json new file mode 100644 index 00000000..4c9be915 --- /dev/null +++ b/dist/src/main/resources/assets/marumasa_sign/lang/ja_jp.json @@ -0,0 +1,3 @@ +{ + "key.marumasa_sign.open_menu": "MarumaSign を開く" +} \ No newline at end of file diff --git a/dist/src/main/resources/assets/marumasa_sign/lang/ja_jp.lang b/dist/src/main/resources/assets/marumasa_sign/lang/ja_jp.lang new file mode 100644 index 00000000..2c81b4ec --- /dev/null +++ b/dist/src/main/resources/assets/marumasa_sign/lang/ja_jp.lang @@ -0,0 +1 @@ +key.marumasa_sign.open_menu=MarumaSign を開く diff --git a/dist/src/main/resources/mcmod.info b/dist/src/main/resources/mcmod.info new file mode 100644 index 00000000..45752b8e --- /dev/null +++ b/dist/src/main/resources/mcmod.info @@ -0,0 +1,16 @@ +[ + { + "modid": "marumasa_sign", + "name": "MarumaSign", + "description": "Display images on signs.", + "version": "${version}", + "mcversion": "", + "url": "https://github.com/TORO-Server/MarumaSign", + "updateUrl": "", + "authorList": ["marumasa"], + "credits": "", + "logoFile": "assets/marumasa_sign/icon.png", + "screenshots": [], + "dependencies": [] + } +] \ No newline at end of file diff --git a/dist/src/main/resources/pack.mcmeta b/dist/src/main/resources/pack.mcmeta new file mode 100644 index 00000000..d07785b4 --- /dev/null +++ b/dist/src/main/resources/pack.mcmeta @@ -0,0 +1,9 @@ +{ + "pack": { + "description": "MarumaSign", + "pack_format": 15, + "supported_formats": [15, 9999], + "min_format": 15, + "max_format": 9999 + } +} \ No newline at end of file diff --git a/docs/verification.md b/docs/verification.md new file mode 100644 index 00000000..4a4bda3b --- /dev/null +++ b/docs/verification.md @@ -0,0 +1,154 @@ +# 動作確認の結果 + +`tools/verify/matrix.py` による実機確認の結果です。このファイルは `tools/verify/report.py` が生成します。 + +確認の内容: バニラのサーバーを起動し、各ローダーを入れた実際のクライアントで接続して、 +サバイバルモードのまま、ゲーム内のウィンドウでファイルを選び、看板を設置して表示されるまでを自動で行います。 +1 回の起動で、画像 (PNG)、3D モデル (GLB)、動画 (音声付きの MP4) の 3 つを順に確認し、 +最後に、看板の文字をデータとして持たせた看板アイテムを渡して、手持ちの枠の中の見た目がその画像になることを確認します。 + +- **OK**: 3 つとも正しい向きで表示され、看板そのものは隠れていて、看板アイテムも画像の見た目になり、 + Mod を入れていない状態と比べて新しい警告やエラーが出なかった +- **要確認**: 動作はしたが、新しい警告が出たか、表示を確認できなかった +- **失敗**: 動作しなかった +- **対象外**: Mod を入れていない状態でもゲームが起動しないか、サーバーに入れなかった (ローダーや影 Mod 側の問題) +- 空欄: そのローダーはこのバージョンに対応していない +- **未確認**: 対応しているが、配布するファイルの現在の内容ではまだ確認していない + +Mod のバージョン: 4.0.0 / 作成日: 2026-10-15 + +| Minecraft | Fabric | Forge | NeoForge | LiteLoader | +| --- | --- | --- | --- | --- | +| 26.3 | OK | 要確認 | OK | | +| 26.2 | OK | OK | OK | | +| 26.1.2 | OK | OK | OK | | +| 26.1.1 | OK | OK | OK | | +| 26.1 | OK | OK | OK | | +| 1.21.11 | OK | OK | OK | | +| 1.21.10 | OK | OK | OK | | +| 1.21.9 | OK | OK | OK | | +| 1.21.8 | OK | OK | OK | | +| 1.21.7 | OK | OK | OK | | +| 1.21.6 | OK | OK | OK | | +| 1.21.5 | OK | OK | OK | | +| 1.21.4 | OK | OK | OK | | +| 1.21.3 | OK | OK | OK | | +| 1.21.2 | OK | | OK | | +| 1.21.1 | OK | OK | OK | | +| 1.21 | OK | OK | OK | | +| 1.20.6 | OK | OK | OK | | +| 1.20.5 | OK | | OK | | +| 1.20.4 | OK | OK | OK | | +| 1.20.3 | OK | 対象外 | OK | | +| 1.20.2 | OK | OK | OK | | +| 1.20.1 | OK | OK | OK | | +| 1.20 | OK | OK | | | +| 1.19.4 | OK | OK | | | +| 1.19.3 | OK | OK | | | +| 1.19.2 | OK | OK | | | +| 1.19.1 | OK | OK | | | +| 1.19 | OK | OK | | | +| 1.18.2 | OK | OK | | | +| 1.18.1 | OK | OK | | | +| 1.18 | OK | OK | | | +| 1.17.1 | OK | OK | | | +| 1.17 | OK | | | | +| 1.16.5 | OK | OK | | | +| 1.16.4 | OK | OK | | | +| 1.16.3 | OK | OK | | | +| 1.16.2 | OK | OK | | | +| 1.16.1 | OK | OK | | | +| 1.16 | OK | | | | +| 1.15.2 | OK | OK | | | +| 1.15.1 | OK | OK | | | +| 1.15 | OK | OK | | | +| 1.14.4 | OK | OK | | | +| 1.14.3 | OK | OK | | | +| 1.14.2 | OK | OK | | | +| 1.14.1 | OK | | | | +| 1.14 | OK | | | | +| 1.12.2 | | OK | | OK | +| 1.12.1 | | OK | | OK | +| 1.12 | | OK | | OK | +| 1.11.2 | | OK | | OK | +| 1.11 | | OK | | OK | +| 1.10.2 | | OK | | OK | +| 1.10 | | OK | | OK | +| 1.9.4 | | OK | | OK | +| 1.9 | | OK | | OK | +| 1.8.9 | | OK | | OK | +| 1.8.8 | | OK | | | +| 1.8 | | OK | | OK | +| 1.7.10 | | OK | | OK | + +合計: OK 136、要確認 1、対象外 1 + +## 影 Mod を入れた状態 + +影 Mod (シェーダーを使えるようにする Mod) とシェーダーパックを入れて、同じ確認を行った結果です。 +マスの中は「影 Mod + シェーダーパック: 結果」です。 +Iris は Sodium と、Oculus は Rubidium または Embeddium と一緒に入れています。空欄は、確認していない組み合わせです。 +シェーダーは絵にも影や空の色を付けるので、色そのものではなく、絵が正しい場所に正しい向きで写っていることを確認しています。 + +次の組み合わせは、この Mod を入れなくても影 Mod が動かないため、確認の対象から外しています。 + +- Forge 1.21.1 + OptiFine 1.21.1 HD U J1: OptiFine の読み込み中にゲームが終了する +- Forge 1.14.2 + OptiFine 1.14.2 HD U F1: ゲームが起動しない +- OptiFine 1.8.9 + MakeUp Ultra Fast: 画面が真っ黒になる + +| Minecraft | Fabric | Forge | NeoForge | LiteLoader | +| --- | --- | --- | --- | --- | +| 26.3 | Iris + BSL: OK | | Iris + BSL: 対象外 | | +| 26.2 | Iris + BSL: OK | | Iris + BSL: OK | | +| 26.1.2 | Iris + BSL: OK
Iris + Complementary Reimagined: OK | | Iris + BSL: OK | | +| 26.1.1 | Iris + BSL: 対象外 | | Iris + BSL: 対象外 | | +| 26.1 | Iris + BSL: 対象外 | | Iris + BSL: 対象外 | | +| 1.21.11 | Iris + BSL: OK
Iris + MakeUp Ultra Fast: OK | | Iris + BSL: OK | | +| 1.21.10 | Iris + BSL: OK | | Iris + BSL: OK
Iris + Photon: OK | | +| 1.21.9 | Iris + BSL: OK | | | | +| 1.21.8 | Iris + BSL: OK
Iris + Complementary Reimagined: OK | | Iris + BSL: OK | | +| 1.21.7 | Iris + BSL: OK | | Iris + BSL: OK | | +| 1.21.6 | Iris + BSL: OK | | Iris + BSL: OK | | +| 1.21.5 | Iris + BSL: OK | | Iris + BSL: OK | | +| 1.21.4 | Iris + BSL: OK
Iris + Photon: OK | | Iris + BSL: OK | | +| 1.21.3 | Iris + BSL: OK | | Iris + BSL: OK | | +| 1.21.2 | Iris + BSL: OK | | Iris + BSL: OK | | +| 1.21.1 | Iris + BSL: OK | | Iris + BSL: OK
Iris + Sildur's Vibrant: OK | | +| 1.21 | Iris + BSL: OK | | Iris + BSL: 対象外 | | +| 1.20.6 | Iris + BSL: OK | | | | +| 1.20.5 | Iris + BSL: 対象外 | | | | +| 1.20.4 | Iris + BSL: OK | | | | +| 1.20.3 | Iris + BSL: OK | | | | +| 1.20.2 | Iris + BSL: 対象外 | | | | +| 1.20.1 | Iris + BSL: OK
Iris + MakeUp Ultra Fast: OK | Oculus + BSL: OK
Oculus + Complementary Reimagined: OK
OptiFine + BSL: OK | | | +| 1.20 | Iris + BSL: 対象外 | Oculus + BSL: OK | | | +| 1.19.4 | Iris + BSL: OK | Oculus + BSL: OK | | | +| 1.19.3 | Iris + BSL: OK | | | | +| 1.19.2 | Iris + BSL: OK | Oculus + BSL: OK | | | +| 1.19.1 | Iris + BSL: OK | Oculus + BSL: OK | | | +| 1.19 | Iris + BSL: OK | Oculus + BSL: OK | | | +| 1.18.2 | Iris + BSL: OK | Oculus + BSL: OK
OptiFine + BSL: OK | | | +| 1.18.1 | Iris + BSL: OK | | | | +| 1.18 | Iris + BSL: OK | | | | +| 1.17.1 | Iris + BSL: OK | | | | +| 1.17 | Iris + BSL: 要確認 | | | | +| 1.16.5 | Iris + BSL: OK
Iris + Sildur's Vibrant: OK | Oculus + BSL: OK
OptiFine + BSL: OK | | | +| 1.16.4 | | OptiFine + BSL: OK | | | +| 1.16.3 | | OptiFine + BSL: OK | | | +| 1.16.2 | | OptiFine + BSL: OK | | | +| 1.16.1 | | OptiFine + BSL: OK | | | +| 1.15.2 | | OptiFine + BSL: OK | | | +| 1.14.4 | | OptiFine + BSL: OK | | | +| 1.14.3 | | OptiFine + BSL: 失敗 | | | +| 1.14.2 | | OptiFine + BSL: 対象外 | | | +| 1.12.2 | | OptiFine + BSL: OK
OptiFine + Complementary Reimagined: OK | | OptiFine + BSL: OK | +| 1.12.1 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.12 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.11.2 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.11 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.10.2 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.10 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.9.4 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.8.9 | | OptiFine + BSL: OK | | OptiFine + BSL: OK | +| 1.8.8 | | OptiFine + BSL: OK | | | +| 1.7.10 | | OptiFine + BSL: OK
OptiFine + Sildur's Vibrant: OK | | OptiFine + BSL: OK | diff --git a/gradle.properties b/gradle.properties index 8294d136..3fd9791d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,13 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - -# Fabric Properties - # check these on https://modmuss50.me/fabric.html - minecraft_version=26.2 - loader_version=0.19.3 +org.gradle.jvmargs=-Xmx8G +org.gradle.parallel=false # Mod Properties - mod_version = 3.0.1 - maven_group = marumasa - archives_base_name = marumasa_sign +mod_version = 4.0.0 +maven_group = marumasa +archives_base_name = marumasa_sign -# Dependencies - # check this on https://modmuss50.me/fabric.html - fabric_version=0.154.2+26.2 +# Build tooling +unimined_version = 1.4.2-SNAPSHOT +# 26.x のクラスファイルを読むために必要な JDK +compile_jdk = 25 diff --git a/gradle/target.gradle b/gradle/target.gradle new file mode 100644 index 00000000..4a1a492b --- /dev/null +++ b/gradle/target.gradle @@ -0,0 +1,184 @@ +// targets.json の 1 項目 (Minecraft のバージョン 1 つ) をビルドするための共通設定。 +// ソースは adapters/ 以下にあり、世代 (era) の sources で指定したフォルダを重ねて使う。 +// どの項目でもパッケージは marumasa.marumasa_sign.adapter で、jar にまとめるときに項目ごとの名前へ移す。 + +apply plugin: 'java' +apply plugin: 'xyz.wagyourtail.unimined' + +def spec = project.ext.spec +def sourceDirs = { String sourceSetName, String kind -> + (spec.sources[sourceSetName] ?: []).collect { rootProject.file("adapters/${it}/${kind}") } +} + +sourceSets { + main { + java.srcDirs = sourceDirs('main', 'java') + resources.srcDirs = sourceDirs('main', 'resources') + } +} +spec.loaders.each { loaderName, loaderSpec -> + sourceSets.create(loaderName) { + java.srcDirs = sourceDirs(loaderName, 'java') + resources.srcDirs = sourceDirs(loaderName, 'resources') + } +} + +repositories { + // LiteLoader のスナップショットは公式のリダイレクタが停止しているため、配布元を直接指定する + exclusiveContent { + forRepository { + maven { + name = 'LiteLoader snapshots' + url = 'https://repo.mumfrey.com/content/repositories/snapshots/' + } + } + filter { + includeVersionByRegex('com\\.mumfrey', 'liteloader', '.*-SNAPSHOT') + } + } + mavenCentral() +} + +tasks.withType(JavaCompile).configureEach { + sourceCompatibility = '8' + targetCompatibility = '8' +} + +// ソースに埋め込むバージョン情報 +def generatedDir = layout.buildDirectory.dir('generated/buildinfo') +def packageName = 'marumasa.marumasa_sign.adapter' +def generateBuildInfo = tasks.register('generateBuildInfo') { + def modVersion = project.version.toString() + def outputDir = generatedDir + inputs.property('version', modVersion) + inputs.property('package', packageName) + outputs.dir(outputDir) + doLast { + def file = new File(outputDir.get().asFile, packageName.replace('.', '/') + '/BuildInfo.java') + file.parentFile.mkdirs() + file.setText("package ${packageName};\n\npublic final class BuildInfo {\n" + + " public static final String VERSION = \"${modVersion}\";\n\n" + + " private BuildInfo() {\n }\n}\n", 'UTF-8') + } +} +sourceSets.main.java.srcDir(generateBuildInfo) + +def applyMappings = { mappingsConfig -> + def parts = spec.mappings.split(':') + switch (parts[0]) { + case 'mcp': + mappingsConfig.searge() + mappingsConfig.mcp(parts[1], parts[2]) + break + case 'mojmap': + mappingsConfig.mojmap() + break + case 'none': + // 26.1 以降は難読化されていないため不要 + break + default: + throw new GradleException("Unknown mappings: ${spec.mappings}") + } +} + +unimined.minecraft { + version spec.minecraft + + mappings { + applyMappings(delegate) + } + + defaultRemapJar = false +} + +spec.loaders.each { loaderName, loaderSpec -> + unimined.minecraft(sourceSets[loaderName]) { + combineWith(sourceSets.main) + + switch (loaderName) { + case 'forge': + minecraftForge { + loader loaderSpec.loader + } + break + case 'neoforge': + neoForge { + loader loaderSpec.loader + } + break + case 'fabric': + fabric { + loader loaderSpec.loader + } + break + case 'liteloader': + side 'client' + liteloader { + loader loaderSpec.loader + } + break + default: + throw new GradleException("Unknown loader: ${loaderName}") + } + + // ローダーが足したメソッドと同じ名前になってしまうメソッドに、別の名前を付ける。 + // [クラス, "メソッド;シグネチャ", 新しい名前] の組で、名前は SRG のもの + if (loaderSpec.stubs) { + mappings { + stubs(['searge', 'mojmap']) { + loaderSpec.stubs.each { stub -> + c([stub[0]]) { + m([stub[1], stub[2]]) + } + } + } + } + } + + if (spec.mappings == 'mojmap' && loaderName in ['forge', 'neoforge']) { + // ローダーが足したメソッドと Minecraft のメソッドの名前がぶつかるバージョンがある。 + // 名前を付け直した結果が同じになるだけで動作には影響しないため、無視して進める + minecraftRemapper.config { + ignoreConflicts(true) + } + } + + defaultRemapJar = true + } + + dependencies.add("${loaderName}Implementation", project(':core')) +} + +dependencies { + implementation project(':core') +} + +// Fabric 用のメタデータ。統合 jar の中に入れ子で入り、対応するバージョンのときだけ読み込まれる。 +// ビルドツールが設定時にこのファイルを読むため、タスクではなくその場で書き出す +if (spec.loaders.fabric != null) { + def versions = spec.loaders.fabric.versions + def label = versions.size() == 1 ? versions[0] : "${versions.first()} - ${versions.last()}" + def metadataDir = layout.buildDirectory.dir('generated/fabric-resources').get().asFile + def metadata = groovy.json.JsonOutput.prettyPrint(groovy.json.JsonOutput.toJson([ + schemaVersion: 1, + id : "marumasa_sign_${spec.name}".toString(), + version : project.version.toString(), + name : "MarumaSign (${label})".toString(), + description : "MarumaSign for Minecraft ${label}.".toString(), + license : 'MIT', + environment : 'client', + entrypoints : [client: ['marumasa.marumasa_sign.adapter.FabricEntry']], + depends : [marumasa_sign: '*', minecraft: versions], + custom : [modmenu: [parent: 'marumasa_sign', badges: ['library']]], + ])) + '\n' + def metadataFile = new File(metadataDir, 'fabric.mod.json') + if (!metadataFile.exists() || metadataFile.getText('UTF-8') != metadata) { + metadataDir.mkdirs() + metadataFile.setText(metadata, 'UTF-8') + } + sourceSets.fabric.resources.srcDir(metadataDir) +} + +jar { + enabled = false +} diff --git a/settings.gradle b/settings.gradle index 98205f4e..fbe15fd4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,34 @@ pluginManagement { repositories { + maven { + name = 'wagyourtail releases' + url = 'https://maven.wagyourtail.xyz/releases' + } + maven { + name = 'wagyourtail snapshots' + url = 'https://maven.wagyourtail.xyz/snapshots' + } + maven { + name = 'NeoForged' + url = 'https://maven.neoforged.net/releases' + } + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' } - gradlePluginPortal() + mavenCentral() + gradlePluginPortal { + content { + excludeGroup('org.apache.logging.log4j') + } + } + } + plugins { + id 'xyz.wagyourtail.unimined' version "${unimined_version}" } } @@ -13,3 +37,19 @@ plugins { } rootProject.name = 'MarumaSign' + +include 'core' +include 'bootstrap' +include 'dist' + +// targets.json の各項目が、Minecraft のバージョン 1 つ分のビルド対象 +// 開発中は -PmarumaOnly=mc1_21_8,mc26_2 のように対象を絞ると、設定にかかる時間を短くできる +def marumaOnly = (providers.gradleProperty('marumaOnly').orNull ?: '').tokenize(',') +new groovy.json.JsonSlurper().parse(file('targets.json')).targets.findAll { + marumaOnly.isEmpty() || it.name in marumaOnly +}.each { target -> + include "targets:${target.name}" + def dir = file("targets/${target.name}") + dir.mkdirs() + project(":targets:${target.name}").projectDir = dir +} diff --git a/src/main/java/marumasa/marumasa_sign/Config.java b/src/main/java/marumasa/marumasa_sign/Config.java deleted file mode 100644 index d4713820..00000000 --- a/src/main/java/marumasa/marumasa_sign/Config.java +++ /dev/null @@ -1,86 +0,0 @@ -package marumasa.marumasa_sign; - -import com.google.gson.Gson; -import net.fabricmc.loader.api.FabricLoader; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -import static marumasa.marumasa_sign.MarumaSign.MOD_ID; - -public class Config { - private static final Path path = FabricLoader.getInstance().getConfigDir().normalize().resolve(MOD_ID + ".json"); - - private int MaxThreads = 5; - - // 画像の同時ロード数 設定 - public void setMaxThreads(int value) { - if (value < 1) value = 1; - if (value > 32) value = 32; - MaxThreads = value; - serialize(); - } - - // 画像の同時ロード数 追加 - public void addMaxThreads(int value) { - final int tmp = getMaxThreads() + value; - setMaxThreads(tmp); - } - - // 画像の同時ロード数 取得 - public int getMaxThreads() { - return MaxThreads; - } - - public Config() { - final File configFile = path.toFile(); - if (!configFile.exists()) { - serialize(); - } else { - deserialize(); - } - } - - private void deserialize() { - try { - final JsonModel model = loadJSON(); - if (model != null) { - int threads = model.MaxThreads(); - if (threads < 1) threads = 1; - if (threads > 32) threads = 32; - MaxThreads = threads; - } - } catch (Exception e) { - marumasa.marumasa_sign.MarumaSign.LOGGER.error("Failed to deserialize config", e); - } - } - - private void serialize() { - try { - saveJSON(new JsonModel(getMaxThreads())); - } catch (Exception e) { - marumasa.marumasa_sign.MarumaSign.LOGGER.error("Failed to serialize config", e); - } - } - - private static final Gson gson = new Gson(); - - private static JsonModel loadJSON() throws IOException { - try (final BufferedReader reader = Files.newBufferedReader(Config.path)) { - return gson.fromJson(reader, JsonModel.class); - } - } - - private static void saveJSON(JsonModel model) throws IOException { - try (final BufferedWriter writer = Files.newBufferedWriter(Config.path)) { - gson.toJson(model, model.getClass(), writer); - } - } - - private record JsonModel(int MaxThreads) { - } -} \ No newline at end of file diff --git a/src/main/java/marumasa/marumasa_sign/MarumaSign.java b/src/main/java/marumasa/marumasa_sign/MarumaSign.java deleted file mode 100644 index 679c74ee..00000000 --- a/src/main/java/marumasa/marumasa_sign/MarumaSign.java +++ /dev/null @@ -1,19 +0,0 @@ -package marumasa.marumasa_sign; - -import com.mojang.logging.LogUtils; -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; - -public class MarumaSign implements ModInitializer { - // ModのID - public static final String MOD_ID = "marumasa_sign"; - // ロガー - public static final Logger LOGGER = LogUtils.getLogger(); - - public static final Config CONFIG = new Config(); - - @Override - public void onInitialize() { - LOGGER.info("Start: " + MOD_ID); - } -} diff --git a/src/main/java/marumasa/marumasa_sign/animation/GifFrame.java b/src/main/java/marumasa/marumasa_sign/animation/GifFrame.java deleted file mode 100644 index 65e2ca9c..00000000 --- a/src/main/java/marumasa/marumasa_sign/animation/GifFrame.java +++ /dev/null @@ -1,25 +0,0 @@ -package marumasa.marumasa_sign.animation; - -import marumasa.marumasa_sign.MarumaSign; -import net.minecraft.client.renderer.rendertype.RenderType; -import net.minecraft.resources.Identifier; - -import java.util.List; -import java.util.NavigableMap; - -public class GifFrame { - public final String stringURL; - public final NavigableMap frameMap; - public final int repetitions; - public final int totalDuration; - public final List identifiers; - - public GifFrame(String stringURL, NavigableMap frameMap, int repetitions, List identifiers) { - this.stringURL = stringURL; - this.frameMap = frameMap; - this.repetitions = repetitions; - this.totalDuration = frameMap.isEmpty() ? 1 : frameMap.lastKey(); - this.identifiers = identifiers; - MarumaSign.LOGGER.info(String.valueOf(repetitions)); - } -} diff --git a/src/main/java/marumasa/marumasa_sign/animation/GifPlayer.java b/src/main/java/marumasa/marumasa_sign/animation/GifPlayer.java deleted file mode 100644 index 5c12fd81..00000000 --- a/src/main/java/marumasa/marumasa_sign/animation/GifPlayer.java +++ /dev/null @@ -1,37 +0,0 @@ -package marumasa.marumasa_sign.animation; - -import marumasa.marumasa_sign.MarumaSign; -import marumasa.marumasa_sign.client.sign.CustomSignProvider; -import net.minecraft.client.renderer.rendertype.RenderType; - -import java.util.*; - -public class GifPlayer { - public static final Map gifMap = new java.util.concurrent.ConcurrentHashMap<>(); - - public static RenderType getRenderType(String stringURL, RenderType defaultRenderType, long startTime) { - GifFrame gifFrame = gifMap.get(stringURL); - if (gifFrame == null) return defaultRenderType; - - NavigableMap frameMap = gifFrame.frameMap; - if (frameMap.isEmpty()) return defaultRenderType; - - long elapsed = System.currentTimeMillis() - startTime; - int totalDuration = gifFrame.totalDuration; - int repetitions = gifFrame.repetitions; - - if (repetitions > 0) { - long maxDuration = (long) totalDuration * repetitions; - if (elapsed >= maxDuration) { - return frameMap.lastEntry().getValue(); - } - } - - int loopElapsed = (int) (elapsed % totalDuration); - Map.Entry entry = frameMap.higherEntry(loopElapsed); - if (entry == null) { - return frameMap.firstEntry().getValue(); - } - return entry.getValue(); - } -} diff --git a/src/main/java/marumasa/marumasa_sign/animation/WebpDecoder.java b/src/main/java/marumasa/marumasa_sign/animation/WebpDecoder.java deleted file mode 100644 index 79c584f4..00000000 --- a/src/main/java/marumasa/marumasa_sign/animation/WebpDecoder.java +++ /dev/null @@ -1,256 +0,0 @@ -package marumasa.marumasa_sign.animation; - -import com.mojang.blaze3d.platform.NativeImage; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; - -public class WebpDecoder { - - private static Method getPixelMethod = null; - static { - try { - getPixelMethod = NativeImage.class.getMethod("getPixelColor", int.class, int.class); - } catch (NoSuchMethodException e) { - try { - getPixelMethod = NativeImage.class.getMethod("getPixelRGBA", int.class, int.class); - } catch (NoSuchMethodException ex) { - // Ignore, will handle invocation error - } - } - } - - private static int getPixelColor(NativeImage image, int x, int y) { - if (getPixelMethod == null) return 0; - try { - return (Integer) getPixelMethod.invoke(image, x, y); - } catch (Exception e) { - return 0; - } - } - - static class WebpFrame { - int x; - int y; - int w; - int h; - int duration; - int blendMethod; - int disposalMethod; - byte[] frameData; - } - - public static DecodedAnimation read(InputStream is) throws IOException { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - byte[] temp = new byte[4096]; - int read; - while ((read = is.read(temp, 0, temp.length)) != -1) { - bos.write(temp, 0, read); - } - return read(bos.toByteArray()); - } - - public static DecodedAnimation read(byte[] bytes) throws IOException { - if (bytes.length < 12) { - throw new IOException("Invalid WebP: Too short"); - } - String riff = new String(bytes, 0, 4, StandardCharsets.US_ASCII); - String webp = new String(bytes, 8, 4, StandardCharsets.US_ASCII); - if (!riff.equals("RIFF") || !webp.equals("WEBP")) { - throw new IOException("Invalid WebP signature"); - } - - byte[] vp8xData = null; - int canvasWidth = 0; - int canvasHeight = 0; - int numPlays = 0; - - List webpFrames = new ArrayList<>(); - - int pos = 12; - while (pos < bytes.length - 8) { - String type = new String(bytes, pos, 4, StandardCharsets.US_ASCII); - int size = readInt32LE(bytes, pos + 4); - pos += 8; - - if (pos + size > bytes.length) { - // Truncated chunk, stop parsing - break; - } - - byte[] data = new byte[size]; - System.arraycopy(bytes, pos, data, 0, size); - - if (type.equals("VP8X")) { - vp8xData = data; - if (data.length >= 10) { - canvasWidth = readInt24LE(data, 4) + 1; - canvasHeight = readInt24LE(data, 7) + 1; - } - } else if (type.equals("ANIM")) { - if (data.length >= 6) { - numPlays = readInt16LE(data, 4); - } - } else if (type.equals("ANMF")) { - if (data.length >= 16) { - WebpFrame frame = new WebpFrame(); - frame.x = readInt24LE(data, 0) * 2; - frame.y = readInt24LE(data, 3) * 2; - frame.w = readInt24LE(data, 6) + 1; - frame.h = readInt24LE(data, 9) + 1; - frame.duration = readInt24LE(data, 12); - - int flags = data[15] & 0xFF; - frame.disposalMethod = flags & 0x01; - frame.blendMethod = (flags & 0x02) >>> 1; - - int frameDataSize = size - 16; - frame.frameData = new byte[frameDataSize]; - System.arraycopy(data, 16, frame.frameData, 0, frameDataSize); - - webpFrames.add(frame); - } - } - - pos += size; - if (size % 2 != 0) { - pos++; // padding byte - } - } - - if (canvasWidth <= 0 || canvasHeight <= 0) { - // Fallback for non-extended WebP (static VP8/VP8L) - try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes)) { - NativeImage staticImage = NativeImage.read(bais); - canvasWidth = staticImage.getWidth(); - canvasHeight = staticImage.getHeight(); - - int[] pixels = new int[canvasWidth * canvasHeight]; - for (int y = 0; y < canvasHeight; y++) { - for (int x = 0; x < canvasWidth; x++) { - int abgr = getPixelColor(staticImage, x, y); - pixels[x + y * canvasWidth] = abgrToArgb(abgr); - } - } - staticImage.close(); - - List frames = new ArrayList<>(); - frames.add(new AnimationFrame(pixels, 100)); - return new DecodedAnimation(canvasWidth, canvasHeight, 0, frames); - } - } - - AnimationCanvas canvas = new AnimationCanvas(canvasWidth, canvasHeight); - List frames = new ArrayList<>(); - - for (WebpFrame frame : webpFrames) { - byte[] singleWebp = reconstructWebp(vp8xData, frame.w, frame.h, frame.frameData); - - NativeImage frameImage; - try (ByteArrayInputStream bais = new ByteArrayInputStream(singleWebp)) { - frameImage = NativeImage.read(bais); - } - if (frameImage == null) { - throw new IOException("Failed to decode WebP frame"); - } - - int[] pixels = new int[frame.w * frame.h]; - for (int y = 0; y < frame.h; y++) { - for (int x = 0; x < frame.w; x++) { - int abgr = getPixelColor(frameImage, x, y); - pixels[x + y * frame.w] = abgrToArgb(abgr); - } - } - frameImage.close(); - - canvas.drawFrame(pixels, frame.x, frame.y, frame.w, frame.h, frame.blendMethod, frame.disposalMethod); - - int delayMs = frame.duration; - if (delayMs < 10) { - delayMs = 100; - } - - frames.add(new AnimationFrame(canvas.getCanvasCopy(), delayMs)); - - canvas.postDraw(frame.x, frame.y, frame.w, frame.h, frame.disposalMethod); - } - - return new DecodedAnimation(canvasWidth, canvasHeight, numPlays, frames); - } - - private static byte[] reconstructWebp(byte[] originalVp8xData, int frameW, int frameH, byte[] frameData) throws IOException { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - bos.write("RIFF".getBytes(StandardCharsets.US_ASCII)); - bos.write(new byte[4]); // size placeholder - bos.write("WEBP".getBytes(StandardCharsets.US_ASCII)); - - byte[] vp8x = new byte[10]; - if (originalVp8xData != null && originalVp8xData.length >= 10) { - System.arraycopy(originalVp8xData, 0, vp8x, 0, 10); - } - // Clear animation flag - vp8x[0] = (byte) (vp8x[0] & ~0x02); - - int wMinus1 = frameW - 1; - int hMinus1 = frameH - 1; - vp8x[4] = (byte) (wMinus1 & 0xFF); - vp8x[5] = (byte) ((wMinus1 >>> 8) & 0xFF); - vp8x[6] = (byte) ((wMinus1 >>> 16) & 0xFF); - vp8x[7] = (byte) (hMinus1 & 0xFF); - vp8x[8] = (byte) ((hMinus1 >>> 8) & 0xFF); - vp8x[9] = (byte) ((hMinus1 >>> 16) & 0xFF); - - writeChunk(bos, "VP8X", vp8x); - bos.write(frameData); - - byte[] webpBytes = bos.toByteArray(); - int riffSize = webpBytes.length - 8; - webpBytes[4] = (byte) (riffSize & 0xFF); - webpBytes[5] = (byte) ((riffSize >>> 8) & 0xFF); - webpBytes[6] = (byte) ((riffSize >>> 16) & 0xFF); - webpBytes[7] = (byte) ((riffSize >>> 24) & 0xFF); - - return webpBytes; - } - - private static void writeChunk(ByteArrayOutputStream out, String type, byte[] data) throws IOException { - out.write(type.getBytes(StandardCharsets.US_ASCII)); - int len = data.length; - out.write((byte) (len & 0xFF)); - out.write((byte) ((len >>> 8) & 0xFF)); - out.write((byte) ((len >>> 16) & 0xFF)); - out.write((byte) ((len >>> 24) & 0xFF)); - out.write(data); - if (len % 2 != 0) { - out.write(0); - } - } - - private static int readInt16LE(byte[] data, int offset) { - return (data[offset] & 0xFF) | ((data[offset + 1] & 0xFF) << 8); - } - - private static int readInt24LE(byte[] data, int offset) { - return (data[offset] & 0xFF) | ((data[offset + 1] & 0xFF) << 8) | ((data[offset + 2] & 0xFF) << 16); - } - - private static int readInt32LE(byte[] data, int offset) { - return (data[offset] & 0xFF) | ((data[offset + 1] & 0xFF) << 8) | ((data[offset + 2] & 0xFF) << 16) | ((data[offset + 3] & 0xFF) << 24); - } - - private static int abgrToArgb(int abgr) { - int a = (abgr >>> 24) & 0xFF; - int b = (abgr >>> 16) & 0xFF; - int g = (abgr >>> 8) & 0xFF; - int r = abgr & 0xFF; - return (a << 24) | (r << 16) | (g << 8) | b; - } -} diff --git a/src/main/java/marumasa/marumasa_sign/client/CustomSignBlockEntityRenderer.java b/src/main/java/marumasa/marumasa_sign/client/CustomSignBlockEntityRenderer.java deleted file mode 100644 index b2a4a7b4..00000000 --- a/src/main/java/marumasa/marumasa_sign/client/CustomSignBlockEntityRenderer.java +++ /dev/null @@ -1,269 +0,0 @@ -package marumasa.marumasa_sign.client; - -import marumasa.marumasa_sign.client.sign.CustomSignProvider; -import marumasa.marumasa_sign.model.CustomSign; -import marumasa.marumasa_sign.model.CustomSignHolder; -import net.minecraft.world.level.block.SignBlock; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.WallSignBlock; -import net.minecraft.world.level.block.StandingSignBlock; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.client.Minecraft; -import net.minecraft.client.player.LocalPlayer; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.client.renderer.blockentity.StandingSignRenderer; -import net.minecraft.client.renderer.blockentity.state.StandingSignRenderState; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.renderer.SubmitNodeCollector; -import net.minecraft.client.renderer.state.level.CameraRenderState; -import net.minecraft.client.renderer.feature.ModelFeatureRenderer; -import net.minecraft.world.phys.Vec3; -import net.minecraft.world.level.block.state.properties.RotationSegment; -import org.joml.Quaternionf; -import org.joml.Vector3f; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.world.phys.AABB; -import net.minecraft.core.BlockPos; - -public class CustomSignBlockEntityRenderer extends StandingSignRenderer { - - private final Minecraft client; - - public CustomSignBlockEntityRenderer(BlockEntityRendererProvider.Context ctx) { - super(ctx); - this.client = Minecraft.getInstance(); - } - - public static class CustomSignRenderState extends StandingSignRenderState { - public CustomSign customSign; - public boolean isSpectator; - public BlockState blockState; - public final Quaternionf signRotationY = new Quaternionf(); - public boolean isWallSignBlock; - public AABB signAABB; - } - - @Override - public StandingSignRenderState createRenderState() { - return new CustomSignRenderState(); - } - - @Override - public void extractRenderState( - final SignBlockEntity blockEntity, - final StandingSignRenderState state, - final float partialTicks, - final Vec3 cameraPosition, - final ModelFeatureRenderer.@org.jspecify.annotations.Nullable CrumblingOverlay breakProgress - ) { - super.extractRenderState(blockEntity, state, partialTicks, cameraPosition, breakProgress); - - if (state instanceof CustomSignRenderState customState) { - final CustomSign customSign = CustomSignProvider.get(blockEntity); - customState.customSign = customSign; - final BlockState blockState = blockEntity.getBlockState(); - customState.blockState = blockState; - final LocalPlayer player = client.player; - customState.isSpectator = player != null && player.isSpectator(); - - if (customSign != null) { - final Block block = blockState.getBlock(); - if (block instanceof SignBlock) { - final boolean isWallSign = block instanceof WallSignBlock; - customState.isWallSignBlock = isWallSign; - - float rot; - if (isWallSign) { - rot = blockState.getValue(WallSignBlock.FACING).toYRot(); - } else { - rot = RotationSegment.convertToDegrees(blockState.getValue(StandingSignBlock.ROTATION)); - } - customState.signRotationY.fromAxisAngleDeg(0, 1, 0, -rot - 180); - - final CustomSignHolder holder = (CustomSignHolder) blockEntity; - AABB aabb = holder.marumasa$getCustomSignAABB(); - if (aabb == null) { - aabb = calculateSignAABB(customSign, customState.signRotationY, isWallSign, blockEntity.getBlockPos()); - holder.marumasa$setCustomSignAABB(aabb); - } - customState.signAABB = aabb; - } - } - } - } - - @Override - public void submit( - final StandingSignRenderState state, - final PoseStack poseStack, - final SubmitNodeCollector submitNodeCollector, - final CameraRenderState camera - ) { - if (state instanceof CustomSignRenderState customState && customState.customSign != null) { - if (customState.isSpectator) { - super.submit(state, poseStack, submitNodeCollector, camera); - } - - // 視錐台カリングの実行 - if (customState.signAABB != null && !camera.cullFrustum.isVisible(customState.signAABB)) { - return; - } - - render(customState.customSign, customState.signRotationY, customState.isWallSignBlock, poseStack, submitNodeCollector, state.lightCoords, OverlayTexture.NO_OVERLAY); - return; - } - - super.submit(state, poseStack, submitNodeCollector, camera); - } - - private AABB calculateSignAABB( - final CustomSign customSign, - final Quaternionf signRotationY, - final boolean isWallSignBlock, - final BlockPos blockPos - ) { - final float moveZ = isWallSignBlock ? 0.4375f * 2 : 0f; - final CustomSign.Vertex ver = customSign.vertex; - - final Vector3f temp = new Vector3f(); - float minX = Float.POSITIVE_INFINITY; - float minY = Float.POSITIVE_INFINITY; - float minZ = Float.POSITIVE_INFINITY; - float maxX = Float.NEGATIVE_INFINITY; - float maxY = Float.NEGATIVE_INFINITY; - float maxZ = Float.NEGATIVE_INFINITY; - - final float px = (float) blockPos.getX(); - final float py = (float) blockPos.getY(); - final float pz = (float) blockPos.getZ(); - - final Vector3f[] vertices = { - ver.mi_mi(), ver.mi_pl(), ver.pl_pl(), ver.pl_mi() - }; - - for (Vector3f v : vertices) { - // Front face offset - temp.set(v.x, v.y, v.z + moveZ + 0.005f); - signRotationY.transform(temp); - float x = temp.x * 0.5f + 0.5f + px; - float y = temp.y * 0.5f + 0.5f + py; - float z = temp.z * 0.5f + 0.5f + pz; - if (x < minX) minX = x; if (x > maxX) maxX = x; - if (y < minY) minY = y; if (y > maxY) maxY = y; - if (z < minZ) minZ = z; if (z > maxZ) maxZ = z; - - // Back face offset - temp.set(v.x, v.y, v.z + moveZ - 0.005f); - signRotationY.transform(temp); - x = temp.x * 0.5f + 0.5f + px; - y = temp.y * 0.5f + 0.5f + py; - z = temp.z * 0.5f + 0.5f + pz; - if (x < minX) minX = x; if (x > maxX) maxX = x; - if (y < minY) minY = y; if (y > maxY) maxY = y; - if (z < minZ) minZ = z; if (z > maxZ) maxZ = z; - } - - return new AABB(minX, minY, minZ, maxX, maxY, maxZ); - } - - public void render(CustomSign customSign, Quaternionf signRotationY, boolean isWallSignBlock, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int light, int overlay) { - float moveZ = isWallSignBlock ? 0.4375f * 2 : 0f; - - poseStack.pushPose(); - poseStack.translate(0.5f, 0.5f, 0.5f); - poseStack.scale(0.5f, 0.5f, 0.5f); - poseStack.mulPose(signRotationY); - - final CustomSign.Vertex ver = customSign.vertex; - final Vector3f mi_mi = ver.mi_mi(); - final Vector3f mi_pl = ver.mi_pl(); - final Vector3f pl_pl = ver.pl_pl(); - final Vector3f pl_mi = ver.pl_mi(); - - submitNodeCollector.submitCustomGeometry( - poseStack, - customSign.getRenderLayer(), - (pose, vertexConsumer) -> { - // Front face - vertexConsumer.addVertex(pose, mi_mi.x, mi_mi.y, mi_mi.z + moveZ + 0.005F) - .setColor(255, 255, 255, 255) - .setUv(1, 1) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, 1.0F); - - vertexConsumer.addVertex(pose, mi_pl.x, mi_pl.y, mi_pl.z + moveZ + 0.005F) - .setColor(255, 255, 255, 255) - .setUv(1, 0) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, 1.0F); - - vertexConsumer.addVertex(pose, pl_pl.x, pl_pl.y, pl_pl.z + moveZ + 0.005F) - .setColor(255, 255, 255, 255) - .setUv(0, 0) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, 1.0F); - - vertexConsumer.addVertex(pose, pl_mi.x, pl_mi.y, pl_mi.z + moveZ + 0.005F) - .setColor(255, 255, 255, 255) - .setUv(0, 1) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, 1.0F); - - // Back face - vertexConsumer.addVertex(pose, pl_mi.x, pl_mi.y, pl_mi.z + moveZ - 0.005F) - .setColor(255, 255, 255, 255) - .setUv(0, 1) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, -1.0F); - - vertexConsumer.addVertex(pose, pl_pl.x, pl_pl.y, pl_pl.z + moveZ - 0.005F) - .setColor(255, 255, 255, 255) - .setUv(0, 0) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, -1.0F); - - vertexConsumer.addVertex(pose, mi_pl.x, mi_pl.y, mi_pl.z + moveZ - 0.005F) - .setColor(255, 255, 255, 255) - .setUv(1, 0) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, -1.0F); - - vertexConsumer.addVertex(pose, mi_mi.x, mi_mi.y, mi_mi.z + moveZ - 0.005F) - .setColor(255, 255, 255, 255) - .setUv(1, 1) - .setOverlay(overlay) - .setLight(light) - .setNormal(pose, 0.0F, 0.0F, -1.0F); - } - ); - poseStack.popPose(); - } - - @Override - public int getViewDistance() { - return 512; - } - - @Override - public boolean shouldRenderOffScreen() { - return true; - } - - @Override - public boolean shouldRender(final SignBlockEntity blockEntity, final Vec3 cameraPosition) { - final CustomSign customSign = CustomSignProvider.get(blockEntity); - if (customSign == null) { - return Vec3.atCenterOf(blockEntity.getBlockPos()).closerThan(cameraPosition, 64.0); - } - return Vec3.atCenterOf(blockEntity.getBlockPos()).closerThan(cameraPosition, customSign.getViewDistance()); - } -} diff --git a/src/main/java/marumasa/marumasa_sign/client/MarumaSignClient.java b/src/main/java/marumasa/marumasa_sign/client/MarumaSignClient.java deleted file mode 100644 index 4162cb24..00000000 --- a/src/main/java/marumasa/marumasa_sign/client/MarumaSignClient.java +++ /dev/null @@ -1,90 +0,0 @@ -package marumasa.marumasa_sign.client; - -import marumasa.marumasa_sign.Config; -import marumasa.marumasa_sign.MarumaSign; -import marumasa.marumasa_sign.client.screen.ConfigScreen; -import marumasa.marumasa_sign.client.sign.SignWriteManager; -import marumasa.marumasa_sign.http.ServerManager; -import marumasa.marumasa_sign.animation.GifPlayer; -import marumasa.marumasa_sign.image.ImageRequest; -import marumasa.marumasa_sign.util.Utils; -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.entity.BlockEntityTypes; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.client.Minecraft; -import net.minecraft.client.KeyMapping; -import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.network.chat.Component; -import org.lwjgl.glfw.GLFW; - -import static net.minecraft.client.Minecraft.getInstance; - -public class MarumaSignClient implements ClientModInitializer { - - // 看板のブロックエンティティタイプ 取得 - private static final BlockEntityType signType = BlockEntityTypes.SIGN; - - private static final Minecraft client = getInstance(); - - @Override - public void onInitializeClient() { - // 看板のブロックエンティティのレンダラーを置き換える - BlockEntityRenderers.register(signType, CustomSignBlockEntityRenderer::new); - - loop.start(); - SignWriteManager.init(); - - // キーバインド登録 - KeyMapping open_menu = KeyMappingHelper.registerKeyMapping( - Utils.createKeyBinding("open_menu", GLFW.GLFW_KEY_B) - ); - - // クライアントティックイベントにキーバインドの処理を登録 - ClientTickEvents.END_CLIENT_TICK.register(client -> { - if (client.player == null) return; - // もしキーが押されたら - while (open_menu.consumeClick()) { - Component text = Component.translatable("text.maruma_sign.open_menu"); - client.player.sendSystemMessage(text); - ServerManager.openMenu(); - } - }); - - // キーバインド登録 - KeyMapping binding2 = KeyMappingHelper.registerKeyMapping( - Utils.createKeyBinding("remove_cache", GLFW.GLFW_KEY_M) - ); - ClientTickEvents.END_CLIENT_TICK.register(client -> { - if (client.player == null) return; - // もしキーが押されたら - while (binding2.consumeClick()) { - client.gui.setScreen(new ConfigScreen(client.gui.screen())); - } - }); - } - - private static class loop { - public static void start() { - // 100ms timer - new java.util.Timer(true).schedule(new loopImageRequest(MarumaSign.CONFIG), 0, 100); - } - - private static class loopImageRequest extends java.util.TimerTask { - - private final Config config; - - public loopImageRequest(Config config) { - this.config = config; - } - - @Override - public void run() { - if (client.level == null) return; - client.execute(() -> ImageRequest.load(config.getMaxThreads())); - } - } - } -} diff --git a/src/main/java/marumasa/marumasa_sign/client/screen/ConfigScreen.java b/src/main/java/marumasa/marumasa_sign/client/screen/ConfigScreen.java deleted file mode 100644 index 62cc825c..00000000 --- a/src/main/java/marumasa/marumasa_sign/client/screen/ConfigScreen.java +++ /dev/null @@ -1,91 +0,0 @@ -package marumasa.marumasa_sign.client.screen; - -import marumasa.marumasa_sign.client.sign.CustomSignProvider; -import marumasa.marumasa_sign.image.ImageRequest; -import net.minecraft.client.gui.GuiGraphicsExtractor; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.Component; -import net.minecraft.client.Minecraft; - -import java.util.Objects; - -import static marumasa.marumasa_sign.MarumaSign.CONFIG; - -public class ConfigScreen extends Screen { - // 親スクリーン取得 (開く前のスクリーン) - private final Screen parent; - - public ConfigScreen(Screen parent) { - // ナレーションテキスト追加 - super(Component.literal("MarumaSign Config Screen")); - // 親スクリーン設定 - this.parent = parent; - } - - // 各ウィジェット定義 - public Button button_remove_cache; // キャッシュ削除ボタン - public Button asyncload_add; // 非同期ロード数増加ボタン - public Button asyncload_pull; // 非同期ロード数減少ボタン - public Button close_configscreen; // 閉じるボタン - - @Override - protected void init() { - Minecraft client = Minecraft.getInstance(); - - button_remove_cache = Button.builder(Component.translatable("key.marumasa_sign.remove_cache"), button -> { - // MarumaSignClient.java から丸パクリ - if (ImageRequest.queueSize() != 0) return; - CustomSignProvider.removeCache(); - if (client.player != null) { - client.player.sendSystemMessage(Component.translatable("text.maruma_sign.remove_cache")); - } - client.gui.setScreen(parent); - }) - // レンダリング設定 - .bounds(width / 2 - 105, 20, 200, 20) - // tooltip設定 - .tooltip(Tooltip.create(Component.translatable("text.maruma_sign.remove_cache_tooltip"))) - .build(); - asyncload_add = Button.builder(Component.literal("+"), button -> { - // 画像の同時ロード数 を "1" 追加する (最大32) - if (CONFIG.getMaxThreads() < 32) { - CONFIG.addMaxThreads(1); - } - }) - // レンダリング設定 - .bounds(width / 2 - 105, 60, 20, 20) - .build(); - asyncload_pull = Button.builder(Component.literal("-"), button -> { - // 1未満にならないようにチェック - if (CONFIG.getMaxThreads() > 1) { - // 画像の同時ロード数 を "-1" 追加する - CONFIG.addMaxThreads(-1); - } - }) - // レンダリング設定 - .bounds(width / 2 - 45, 60, 20, 20) - .build(); - close_configscreen = Button.builder(Component.translatable("text.maruma_sign.close"), button -> client.gui.setScreen(parent)) - // レンダリング設定 - .bounds(width / 2 - 105, height - 20, 200, 20) - .build(); - - // 選択可能状態でレンダリング - addRenderableWidget(button_remove_cache); - addRenderableWidget(asyncload_add); - addRenderableWidget(asyncload_pull); - addRenderableWidget(close_configscreen); - } - - @Override - public void extractRenderState(final GuiGraphicsExtractor graphics, int mouseX, int mouseY, final float a) { - super.extractRenderState(graphics, mouseX, mouseY, a); - // 非同期処理数 ラベルレンダリング - graphics.centeredText(font, Component.translatable("text.maruma_sign.asyncprocessnum"), width / 2 - 155, 65, 0xffffffff); - // 非同期処理数 数字レンダリング - graphics.centeredText(font, Component.literal(String.valueOf(CONFIG.getMaxThreads())), width / 2 - 75, 65, 0xffffffff); - } - -} diff --git a/src/main/java/marumasa/marumasa_sign/client/sign/CustomSignProvider.java b/src/main/java/marumasa/marumasa_sign/client/sign/CustomSignProvider.java deleted file mode 100644 index bc47f9ee..00000000 --- a/src/main/java/marumasa/marumasa_sign/client/sign/CustomSignProvider.java +++ /dev/null @@ -1,121 +0,0 @@ -package marumasa.marumasa_sign.client.sign; - -import marumasa.marumasa_sign.model.CustomSign; -import marumasa.marumasa_sign.model.CustomSignHolder; -import marumasa.marumasa_sign.model.TextureURL; -import marumasa.marumasa_sign.animation.GifPlayer; -import marumasa.marumasa_sign.animation.GifFrame; -import marumasa.marumasa_sign.util.Utils; -import net.minecraft.resources.Identifier; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.world.level.block.entity.SignText; -import net.minecraft.client.renderer.rendertype.RenderType; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -public class CustomSignProvider { - - private static final Map loaded = new java.util.concurrent.ConcurrentHashMap<>();// 読み込み済み看板マップ - public static int cacheVersion = 0; // キャッシュ削除の世代管理用 - - public static CustomSign get(SignBlockEntity signBlockEntity) { - CustomSignHolder holder = (CustomSignHolder) signBlockEntity; - SignText frontText = signBlockEntity.getFrontText(); - SignText backText = signBlockEntity.getBackText(); - - if (frontText == holder.marumasa$getLastFrontText() && backText == holder.marumasa$getLastBackText()) { - CustomSign cached = holder.marumasa$getCustomSign(); - if (cached != null && cached.getCacheVersion() == cacheVersion) { - if (cached.isLoading()) { - String signText = CustomSign.read(signBlockEntity); - CustomSign latest = loaded.get(signText); - if (latest != null && !latest.isLoading()) { - holder.marumasa$setCustomSign(latest); - return latest; - } - } - return cached; - } - } - - // 看板に書いてある文字(表面裏面両方)を String に変更 - String signText = CustomSign.read(signBlockEntity); - - // 読み込み済み看板マップ から 取得 - CustomSign customSign = loaded.get(signText); - - if (customSign != null) { - holder.marumasa$setLastFrontText(frontText); - holder.marumasa$setLastBackText(backText); - holder.marumasa$setCustomSign(customSign); - return customSign; - } - - Object[] parameters = toParameters(signText); - if (parameters == null || parameters.length != 9) return null; - - final String stringURL = (String) parameters[0]; - - - - TextureURL textureURL = TextureURLProvider.get(stringURL, signText); - - customSign = CustomSign.create(textureURL, parameters); - - // 読み込み済み看板 追加 - loaded.put(signText, customSign); - - holder.marumasa$setLastFrontText(frontText); - holder.marumasa$setLastBackText(backText); - holder.marumasa$setCustomSign(customSign); - - return customSign; - } - - public static void changeSignTexture(TextureURL textureURL, String signText) { - Object[] params = toParameters(signText); - if (params == null) return; - CustomSign customSign = CustomSign.create(textureURL, params); - loaded.put(signText, customSign); - } - - - public static Object[] toParameters(String signText) { - if (signText == null) return null; - try { - final String[] parameters = signText.split("\\|"); - if (parameters.length < 9) return null; - return new Object[]{ - parameters[0], - Float.parseFloat(parameters[1]), - Float.parseFloat(parameters[2]), - Float.parseFloat(parameters[3]), - Float.parseFloat(parameters[4]), - Float.parseFloat(parameters[5]), - Float.parseFloat(parameters[6]), - Float.parseFloat(parameters[7]), - Float.parseFloat(parameters[8]) - }; - } catch (Exception e) { - return null; - } - } - - - public static void removeCache() { - cacheVersion++; - loaded.clear(); - for (GifFrame gifFrame : GifPlayer.gifMap.values()) { - if (gifFrame.identifiers != null) { - for (Identifier id : gifFrame.identifiers) { - Utils.destroyTexture(id); - } - } - } - GifPlayer.gifMap.clear(); - TextureURLProvider.removeCache(); - } -} diff --git a/src/main/java/marumasa/marumasa_sign/client/sign/SignWriteManager.java b/src/main/java/marumasa/marumasa_sign/client/sign/SignWriteManager.java deleted file mode 100644 index d8392c00..00000000 --- a/src/main/java/marumasa/marumasa_sign/client/sign/SignWriteManager.java +++ /dev/null @@ -1,94 +0,0 @@ -package marumasa.marumasa_sign.client.sign; - -import marumasa.marumasa_sign.mixin.SignEditScreenAccessor; -import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.inventory.SignEditScreen; -import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket; -import net.minecraft.network.chat.Component; -import net.minecraft.ChatFormatting; - -import java.util.Arrays; -import java.util.Objects; - -public class SignWriteManager { - private static String requestText; - - public static void request(String signText) { - Minecraft client = Minecraft.getInstance(); - if (client.player == null) return; - - Component text = Component.translatable("text.maruma_sign.write_mode").withStyle(ChatFormatting.YELLOW); - client.player.sendSystemMessage(text); - requestText = signText; - } - - // 文字列を均等に 4 つに分ける - private static String[] splitStringEvenly(String text) { - String[] result = new String[4]; - - if (text == null || text.isEmpty()) { - Arrays.fill(result, ""); - return result; - } - - int len = text.length(); - int basePartSize = len / 4; - int remainder = len % 4; - - int startIndex = 0; - for (int i = 0; i < 4; i++) { - int partSize = basePartSize + (i < remainder ? 1 : 0); - - if (startIndex >= len) { - result[i] = ""; - } else { - int endIndex = startIndex + partSize; - String part = text.substring(startIndex, endIndex); - if (part.length() > 100) { - part = part.substring(0, 100); - } - result[i] = part; - startIndex = endIndex; - } - } - - return result; - } - - public static void init() { - - ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> { - if (requestText == null) return; - // 開かれたスクリーンが看板の編集のGUIなら - if (screen instanceof SignEditScreen signEditScreen) { - - SignEditScreenAccessor accessor = (SignEditScreenAccessor) signEditScreen; - - SignBlockEntity signBlockEntity = accessor.getBlockEntity(); - if (signBlockEntity == null) return; - - String[] signLines = splitStringEvenly(requestText); - - // 看板を更新する - ServerboundSignUpdatePacket packet = new ServerboundSignUpdatePacket( - signBlockEntity.getBlockPos(), - signBlockEntity.isFacingFrontText(client.player), - signLines[0], - signLines[1], - signLines[2], - signLines[3] - ); - net.minecraft.client.multiplayer.ClientPacketListener connection = client.getConnection(); - if (connection != null) { - connection.send(packet); - } else { - marumasa.marumasa_sign.MarumaSign.LOGGER.warn("Cannot send SignUpdatePacket: connection is null"); - } - requestText = null; - signEditScreen.onClose(); - } - }); - } -} \ No newline at end of file diff --git a/src/main/java/marumasa/marumasa_sign/client/sign/TextureURLProvider.java b/src/main/java/marumasa/marumasa_sign/client/sign/TextureURLProvider.java deleted file mode 100644 index 5fd210ba..00000000 --- a/src/main/java/marumasa/marumasa_sign/client/sign/TextureURLProvider.java +++ /dev/null @@ -1,83 +0,0 @@ -package marumasa.marumasa_sign.client.sign; - -import marumasa.marumasa_sign.model.TextureURL; -import marumasa.marumasa_sign.image.ImageRequest; -import marumasa.marumasa_sign.util.Utils; - -import java.util.*; - -public class TextureURLProvider { - - private static final Map loaded = new java.util.concurrent.ConcurrentHashMap<>();// 読み込み済みテクスチャマップ - private static final Map> loading = new java.util.concurrent.ConcurrentHashMap<>();// 読み込み中テクスチャマップ - private static final List failure = java.util.Collections.synchronizedList(new ArrayList<>());// 読み込み失敗テクスチャリスト - - - public static TextureURL get(String stringURL, String signText) { - - if (loaded.containsKey(stringURL)) { - - return loaded.get(stringURL); - - } else if (loading.containsKey(stringURL)) { - - List customSignList = loading.get(stringURL); - if (customSignList != null) { - customSignList.add(signText); - } - return TextureURL.loading; - - } else if (failure.contains(stringURL)) { - - return TextureURL.error; - - } - - loading.put(stringURL, new ArrayList<>(Collections.singleton(signText))); - - ImageRequest.add(stringURL); - - // 読み込み中の画像を表示する - return TextureURL.loading; - } - - public static List loadedTextureURL(String stringURL, TextureURL textureURL) { - - List signTextList = loading.remove(stringURL); - - loaded.put(stringURL, textureURL); - if (signTextList != null) { - for (String signText : signTextList) { - CustomSignProvider.changeSignTexture(textureURL, signText); - } - } - return signTextList; - } - - public static void failureTextureURL(String stringURL) { - - List signTextList = loading.remove(stringURL); - - if (failure.size() > 1000) { - failure.remove(0); - } - failure.add(stringURL); - if (signTextList != null) { - for (String signText : signTextList) { - CustomSignProvider.changeSignTexture(TextureURL.error, signText); - } - } - } - - - protected static void removeCache() { - - // 登録されているテクスチャ削除 - for (TextureURL textureURL : loaded.values()) - Utils.destroyTexture(textureURL.identifier()); - - loaded.clear(); - loading.clear(); - failure.clear(); - } -} diff --git a/src/main/java/marumasa/marumasa_sign/http/ServerEngine.java b/src/main/java/marumasa/marumasa_sign/http/ServerEngine.java deleted file mode 100644 index 159f0bab..00000000 --- a/src/main/java/marumasa/marumasa_sign/http/ServerEngine.java +++ /dev/null @@ -1,48 +0,0 @@ -package marumasa.marumasa_sign.http; - -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; -import marumasa.marumasa_sign.http.service.APIService; -import marumasa.marumasa_sign.http.service.WebUIService; - -import java.io.IOException; -import java.net.InetSocketAddress; - -public class ServerEngine { - - public HttpServer server; - public final int port; - - public ServerEngine(int port) { - this.port = port; - HttpServer tempServer = null; - try { - tempServer = HttpServer.create(new InetSocketAddress("127.0.0.1", port), 0); - tempServer.setExecutor(java.util.concurrent.Executors.newFixedThreadPool(2, r -> { - Thread thread = new Thread(r); - thread.setDaemon(true); - thread.setName("MarumaSign-HttpServer"); - return thread; - })); - tempServer.createContext("/", new Handler()); - tempServer.start(); - server = tempServer; - } catch (IOException e) { - marumasa.marumasa_sign.MarumaSign.LOGGER.error("Failed to start HttpServer on port " + port, e); - server = null; - } - } - - public static class Handler implements HttpHandler { - @Override - public void handle(HttpExchange exchange) throws IOException { - // リクエストを処理する - if ("POST".equals(exchange.getRequestMethod())) { - APIService.Handle(exchange);// post の場合は APIService - } else { - WebUIService.Handle(exchange);// それ以外 の場合は WebUIService - } - } - } -} diff --git a/src/main/java/marumasa/marumasa_sign/http/ServerManager.java b/src/main/java/marumasa/marumasa_sign/http/ServerManager.java deleted file mode 100644 index a947b797..00000000 --- a/src/main/java/marumasa/marumasa_sign/http/ServerManager.java +++ /dev/null @@ -1,45 +0,0 @@ -package marumasa.marumasa_sign.http; - -import marumasa.marumasa_sign.util.PortManager; - -public class ServerManager { - - private static ServerEngine engine; - - public static synchronized void openMenu() { - if (engine == null) // サーバーが起動していない場合 - build(); // サーバーを起動 - if (engine == null || engine.server == null) { - return; - } - // ブラウザで起動したサーバーに接続する - try { - if (java.awt.Desktop.isDesktopSupported() && java.awt.Desktop.getDesktop().isSupported(java.awt.Desktop.Action.BROWSE)) { - java.awt.Desktop.getDesktop().browse(new java.net.URI(String.format("http://127.0.0.1:%d%s", engine.port, "/index.html"))); - } else { - marumasa.marumasa_sign.MarumaSign.LOGGER.warn("AWT Desktop browsing is not supported on this platform. Access WebUI manually at: http://127.0.0.1:{}", engine.port); - } - } catch (Exception e) { - marumasa.marumasa_sign.MarumaSign.LOGGER.error("Failed to open WebUI in browser", e); - } - } - - public static synchronized void closeMenu() { - if (engine == null) return; - // サーバーを閉じる - if (engine.server != null) { - engine.server.stop(1); // 1秒間の猶予期間 - } - engine = null; - } - - private static void build() { - // ポート番号を設定 - int port = PortManager.generate(); - // サーバーを起動させる - engine = new ServerEngine(port); - if (engine.server == null) { - engine = null; - } - } -} diff --git a/src/main/java/marumasa/marumasa_sign/http/service/APIService.java b/src/main/java/marumasa/marumasa_sign/http/service/APIService.java deleted file mode 100644 index 243efad9..00000000 --- a/src/main/java/marumasa/marumasa_sign/http/service/APIService.java +++ /dev/null @@ -1,199 +0,0 @@ -package marumasa.marumasa_sign.http.service; - -import com.google.gson.Gson; -import com.sun.net.httpserver.Headers; -import com.sun.net.httpserver.HttpExchange; -import marumasa.marumasa_sign.client.sign.SignWriteManager; -import marumasa.marumasa_sign.http.ServerManager; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; - -import static marumasa.marumasa_sign.util.Utils.Base64Decoder; -import static marumasa.marumasa_sign.util.Utils.UploadFile; - -public class APIService { - - public static void Handle(HttpExchange exchange) throws IOException { - String path = exchange.getRequestURI().getPath(); - try { - switch (path) { - case "/upload" -> Upload(exchange); - case "/write" -> Write(exchange); - default -> sendError(exchange, 404, "Not Found"); - } - } catch (Exception e) { - marumasa.marumasa_sign.MarumaSign.LOGGER.error("Error processing API request: " + path, e); - sendError(exchange, 500, "Internal Server Error"); - } - } - - private static void sendError(HttpExchange exchange, int statusCode, String message) throws IOException { - byte[] response = message.getBytes(StandardCharsets.UTF_8); - exchange.sendResponseHeaders(statusCode, response.length); - try (OutputStream os = exchange.getResponseBody()) { - os.write(response); - } - } - - private static byte[] readRequestBodyLimited(HttpExchange exchange, int limitBytes) throws IOException { - try (InputStream is = exchange.getRequestBody(); - ByteArrayOutputStream bos = new ByteArrayOutputStream()) { - byte[] buffer = new byte[4096]; - int read; - int total = 0; - while ((read = is.read(buffer)) != -1) { - total += read; - if (total > limitBytes) { - throw new IOException("Request body exceeds limit of " + limitBytes + " bytes."); - } - bos.write(buffer, 0, read); - } - return bos.toByteArray(); - } - } - - private static void Upload(HttpExchange exchange) throws IOException { - byte[] bodyBytes; - try { - bodyBytes = readRequestBodyLimited(exchange, 10 * 1024 * 1024); // 10MB limit - } catch (IOException e) { - sendError(exchange, 413, "Payload Too Large"); - return; - } - - String reqBody = new String(bodyBytes, StandardCharsets.UTF_8); - UploadJson json; - try { - json = gson.fromJson(reqBody, UploadJson.class); - if (json == null || json.file == null || json.name == null) { - throw new IllegalArgumentException("Invalid payload structure"); - } - } catch (Exception e) { - sendError(exchange, 400, "Bad Request"); - return; - } - - String[] parts = json.file.split(";base64,", 2); - if (parts.length < 2) { - sendError(exchange, 400, "Invalid Base64 Data URI format"); - return; - } - - byte[] fileBytes; - try { - fileBytes = Base64Decoder(parts[1]); - } catch (Exception e) { - sendError(exchange, 400, "Invalid Base64 Encoding"); - return; - } - - // レスポンスヘッダを設定 - Headers responseHeaders = exchange.getResponseHeaders(); - responseHeaders.set("Content-Type", "application/json"); - - String imgURL = UploadFile( - "https://catbox.moe/user/api.php", - fileBytes, - json.name - ); - - // レスポンスボディを設定 - String resBody = gson.toJson(new ResponseJson(imgURL, true)); - // レスポンスを送信 - byte[] resBytes = resBody.getBytes(StandardCharsets.UTF_8); - exchange.sendResponseHeaders(200, resBytes.length); - try (OutputStream os = exchange.getResponseBody()) { - os.write(resBytes); - } - } - - public static void Write(HttpExchange exchange) throws IOException { - byte[] bodyBytes; - try { - bodyBytes = readRequestBodyLimited(exchange, 65536); // 64KB limit - } catch (IOException e) { - sendError(exchange, 413, "Payload Too Large"); - return; - } - - String reqBody = new String(bodyBytes, StandardCharsets.UTF_8); - WriteJson json; - try { - json = gson.fromJson(reqBody, WriteJson.class); - if (json == null || json.address == null) { - throw new IllegalArgumentException("Invalid payload structure"); - } - } catch (Exception e) { - sendError(exchange, 400, "Bad Request"); - return; - } - - // 看板に書かれる文字を生成 - String signText = json.signText(); - - // レスポンスヘッダを設定 - Headers responseHeaders = exchange.getResponseHeaders(); - responseHeaders.set("Content-Type", "application/json"); - - // 看板自動入力をリクエストする - SignWriteManager.request(json.signText()); - - // レスポンスボディを設定 - String resBody = gson.toJson(new ResponseJson(signText, true)); - // レスポンスを送信 - byte[] resBytes = resBody.getBytes(StandardCharsets.UTF_8); - exchange.sendResponseHeaders(200, resBytes.length); - try (OutputStream os = exchange.getResponseBody()) { - os.write(resBytes); - } - - // サーバーを閉じる - Thread closeThread = new Thread(() -> { - try { - Thread.sleep(200); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - ServerManager.closeMenu(); - }); - closeThread.setDaemon(true); - closeThread.start(); - } - - private static final Gson gson = new Gson(); - - private record UploadJson( - String file, - String name - ) { - } - - private record WriteJson( - String address, - float width, float height, - float x, float y, float z, - float rx, float ry, float rz - ) { - public String signText() { - String sanitizedAddress = address == null ? "" : address.replace("|", ""); - return String.format( - "%s|%s|%s|%s|%s|%s|%s|%s|%s", - sanitizedAddress, - floatFormat(x), floatFormat(y), floatFormat(z), - floatFormat(height), floatFormat(width), - floatFormat(rx), floatFormat(ry), floatFormat(rz) - ); - } - - private String floatFormat(float value) { - return Float.toString(value); - } - } - - private record ResponseJson(String result, boolean status) { - } -} diff --git a/src/main/java/marumasa/marumasa_sign/http/service/WebUIService.java b/src/main/java/marumasa/marumasa_sign/http/service/WebUIService.java deleted file mode 100644 index 2a04618c..00000000 --- a/src/main/java/marumasa/marumasa_sign/http/service/WebUIService.java +++ /dev/null @@ -1,100 +0,0 @@ -package marumasa.marumasa_sign.http.service; - -import com.sun.net.httpserver.Headers; -import com.sun.net.httpserver.HttpExchange; -import marumasa.marumasa_sign.MarumaSign; - -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; - -public class WebUIService { - - // アクセスできるファイルのパス一覧 - private static final String[] allowPaths = { - "/index.html", - "/style.css", - "/script.js", - "/utils.js", - "/preview.js", - "/favicon.ico", - "/bootstrap.min.css", - "/sanitize.css", - "/sans.css" - }; - - public static void Handle(HttpExchange exchange) throws IOException { - - String path = exchange.getRequestURI().getPath(); - if ("/".equals(path)) { - path = "/index.html"; - } - - MarumaSign.LOGGER.info("Requested: {}", path); - - // 許可リストチェック - if (!Arrays.asList(allowPaths).contains(path)) { - sendError(exchange, 404, "Not Found"); - return; - } - - // リクエストされたパスをリソースディレクトリ内のファイルの場所に変換 - String resource_path = toResourcePath(path); - - // レスポンスボディをバイナリとして取得 - byte[] responseBody = getResourceBytes(resource_path); - if (responseBody == null) { - sendError(exchange, 404, "Resource Not Found"); - return; - } - - // レスポンスヘッダ の設定 - Headers responseHeaders = exchange.getResponseHeaders(); - // Content-Type を拡張子から判定 - String contentType = getContentType(path); - responseHeaders.set("Content-Type", contentType); - - // レスポンスを送信 - exchange.sendResponseHeaders(200, responseBody.length); - try (OutputStream os = exchange.getResponseBody()) { - os.write(responseBody); - } - } - - private static void sendError(HttpExchange exchange, int statusCode, String message) throws IOException { - byte[] response = message.getBytes(StandardCharsets.UTF_8); - exchange.sendResponseHeaders(statusCode, response.length); - try (OutputStream os = exchange.getResponseBody()) { - os.write(response); - } - } - - // リソースにあるファイルをバイナリとして読み込む - private static byte[] getResourceBytes(String path) { - try (InputStream is = WebUIService.class.getResourceAsStream(path)) { - if (is == null) return null; - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - byte[] buffer = new byte[4096]; - int read; - while ((read = is.read(buffer)) != -1) { - bos.write(buffer, 0, read); - } - return bos.toByteArray(); - } catch (IOException e) { - MarumaSign.LOGGER.error("Failed to load resource: " + path, e); - return null; - } - } - - private static String getContentType(String path) { - if (path.endsWith(".html")) return "text/html; charset=utf-8"; - if (path.endsWith(".css")) return "text/css; charset=utf-8"; - if (path.endsWith(".js")) return "application/javascript; charset=utf-8"; - if (path.endsWith(".ico")) return "image/x-icon"; - return "application/octet-stream"; - } - - private static String toResourcePath(String path) { - return "/webui" + path; - } -} \ No newline at end of file diff --git a/src/main/java/marumasa/marumasa_sign/image/ImageRegister.java b/src/main/java/marumasa/marumasa_sign/image/ImageRegister.java deleted file mode 100644 index 733bd064..00000000 --- a/src/main/java/marumasa/marumasa_sign/image/ImageRegister.java +++ /dev/null @@ -1,111 +0,0 @@ -package marumasa.marumasa_sign.image; - -import marumasa.marumasa_sign.MarumaSign; -import marumasa.marumasa_sign.client.sign.TextureURLProvider; -import marumasa.marumasa_sign.animation.AnimationFrame; -import marumasa.marumasa_sign.animation.DecodedAnimation; -import marumasa.marumasa_sign.animation.GifFrame; -import marumasa.marumasa_sign.animation.GifPlayer; -import marumasa.marumasa_sign.animation.ApngDecoder; -import marumasa.marumasa_sign.animation.GifDecoder; -import marumasa.marumasa_sign.animation.WebpDecoder; -import marumasa.marumasa_sign.model.TextureURL; -import marumasa.marumasa_sign.util.Utils; -import net.minecraft.client.renderer.rendertype.RenderType; -import com.mojang.blaze3d.platform.NativeImage; -import net.minecraft.resources.Identifier; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.NavigableMap; -import java.util.TreeMap; - -public class ImageRegister { - - public static void registerAnimation(byte[] content, String stringURL, String path) throws IOException { - DecodedAnimation animation; - if (Utils.isGif(content)) { - animation = GifDecoder.read(content); - } else if (Utils.isApng(content)) { - animation = ApngDecoder.read(content); - } else if (Utils.isWebp(content)) { - animation = WebpDecoder.read(content); - } else { - throw new IOException("Unsupported animation format"); - } - - final int width = animation.getWidth(); - final int height = animation.getHeight(); - final List frames = animation.getFrames(); - final int frameCount = frames.size(); - - if (width <= 0 || height <= 0 || width > 2048 || height > 2048 || frameCount > 512) { - throw new IOException("Animation validation failed: dimensions or frame count exceed safety limits (max 2048x2048, 512 frames)."); - } - - final int repetitions = animation.getRepetitions(); - - net.minecraft.client.Minecraft.getInstance().execute(() -> { - try { - final NavigableMap frameMap = new TreeMap<>(); - final List identifiers = new java.util.ArrayList<>(); - TextureURL firstTextureURL = TextureURL.error; - int currentDelay = 0; - for (int i = 0; i < frameCount; i++) { - Identifier identifier = Identifier.fromNamespaceAndPath(MarumaSign.MOD_ID, path + "/" + i); - identifiers.add(identifier); - if (i == 0) { - firstTextureURL = new TextureURL(identifier, width, height); - } - AnimationFrame frame = frames.get(i); - Utils.registerTexture(identifier, width, height, frame.getPixels()); - currentDelay += frame.getDelay(); - frameMap.put(currentDelay, Utils.getRenderLayer(identifier)); - } - GifPlayer.gifMap.put(stringURL, new GifFrame(stringURL, frameMap, repetitions, identifiers)); - TextureURLProvider.loadedTextureURL(stringURL, firstTextureURL); - } catch (IOException e) { - MarumaSign.LOGGER.error("Failed to register animation texture", e); - } - }); - } - - - static boolean registerDefault(InputStream stream, String stringURL, Identifier identifier) throws IOException { - - // どんな画像形式でも png に変換する - final InputStream pngStream = Utils.toPNG(stream); - - // もし null (pngに変換できないファイルの場合) return - if (pngStream == null) return false; - - // 変換した png を読み込む - NativeImage image = NativeImage.read(pngStream); - - int width = image.getWidth(); - int height = image.getHeight(); - - if (width <= 0 || height <= 0 || width > 4096 || height > 4096) { - image.close(); - pngStream.close(); - return false; - } - - final TextureURL textureURL = new TextureURL(identifier, width, height); - - net.minecraft.client.Minecraft.getInstance().execute(() -> { - Utils.registerTexture(identifier, image); - TextureURLProvider.loadedTextureURL(stringURL, textureURL); - }); - - return true; - } - - public static void registerError(String url) { - // URL から 画像を読み込めなかったら - - TextureURLProvider.failureTextureURL(url); - - } -} diff --git a/src/main/java/marumasa/marumasa_sign/image/ImageRequest.java b/src/main/java/marumasa/marumasa_sign/image/ImageRequest.java deleted file mode 100644 index cacd5f73..00000000 --- a/src/main/java/marumasa/marumasa_sign/image/ImageRequest.java +++ /dev/null @@ -1,170 +0,0 @@ -package marumasa.marumasa_sign.image; - -import com.google.common.io.BaseEncoding; -import marumasa.marumasa_sign.MarumaSign; -import marumasa.marumasa_sign.util.Utils; -import net.minecraft.resources.Identifier; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.*; - -public class ImageRequest { - private static final Queue queue = new java.util.concurrent.ConcurrentLinkedQueue<>(); - private static final java.util.concurrent.atomic.AtomicInteger activeDownloads = new java.util.concurrent.atomic.AtomicInteger(0); - private static final java.util.concurrent.ExecutorService executor = java.util.concurrent.Executors.newCachedThreadPool( - r -> { - Thread thread = new Thread(r); - thread.setDaemon(true); - thread.setName("MarumaSign-ImageLoader"); - return thread; - } - ); - - public static int queueSize() { - return queue.size(); - } - - public static void add( - // 画像のURL - String stringURL - ) { - if (!queue.contains(stringURL)) { - queue.add(stringURL); - } - } - - public static void load(int maxThreads) { - while (activeDownloads.get() < maxThreads && !queue.isEmpty()) { - String stringURL = queue.poll(); - if (stringURL == null) break; - activeDownloads.incrementAndGet(); - executor.submit(() -> { - try { - getURL(stringURL); - } finally { - activeDownloads.decrementAndGet(); - } - }); - } - } - - public static byte[] getURLContent(String stringURL) throws IOException { - if (stringURL == null) return null; - if (!stringURL.startsWith("http://") && !stringURL.startsWith("https://")) { - throw new IOException("Unsupported protocol scheme in URL: " + stringURL); - } - - // ダウンロードサイズの上限を10MBに設定 (10 * 1024 * 1024 bytes) - final long MAX_SIZE = 1024 * 1024 * 10; - - final String encodeURL = Utils.encodeURL(stringURL); - if (encodeURL == null) return null; - - HttpURLConnection connection = null; - try { - // 接続オブジェクトを生成 - connection = (HttpURLConnection) new URL(encodeURL).openConnection(); - connection.setConnectTimeout(5000); - connection.setReadTimeout(5000); - connection.setRequestMethod("GET"); - // ヘッダーを設定 - connection.setRequestProperty("User-Agent", "Mozilla/5.0 (MarumaSign)"); - connection.setRequestProperty("Accept", "image/png, image/gif, image/jpeg"); - - // 接続を確立 - connection.connect(); - - final long contentLength = connection.getContentLengthLong(); - if (contentLength > MAX_SIZE) { - throw new IOException("Content size (" + contentLength + " bytes) exceeds the limit of " + MAX_SIZE + " bytes."); - } - - try (InputStream input = connection.getInputStream(); - ByteArrayOutputStream output = new ByteArrayOutputStream()) { - - byte[] buffer = new byte[8192]; - int len; - long downloadedBytes = 0; - - while ((len = input.read(buffer)) != -1) { - downloadedBytes += len; - if (downloadedBytes > MAX_SIZE) { - throw new IOException("Content size exceeds the limit during download."); - } - output.write(buffer, 0, len); - } - // byte配列に変換して返す - return output.toByteArray(); - } - - } finally { - // 接続を閉じる - if (connection != null) { - connection.disconnect(); - } - } - } - - public static void getURL(String stringURL) { - String path = URLtoPath(stringURL); - - // ログ出力 - MarumaSign.LOGGER.info("Start: " + stringURL); - - try { - final byte[] content = getURLContent(stringURL); - - if (content == null) { - ImageRegister.registerError(stringURL); - MarumaSign.LOGGER.warn("Failure: " + stringURL); - return; - } - - InputStream stream = new ByteArrayInputStream(content); - - if (Utils.isGif(content) || Utils.isApng(content) || Utils.isAnimatedWebp(content)) { - ImageRegister.registerAnimation(content, stringURL, path); - } else { - - final Identifier identifier = Identifier.fromNamespaceAndPath(MarumaSign.MOD_ID, path); - - if (ImageRegister.registerDefault(stream, stringURL, identifier)) { - // ログ出力 - MarumaSign.LOGGER.info("Load: " + stringURL + " : " + identifier); - } else { - // エラーログ出力 - ImageRegister.registerError(stringURL); - MarumaSign.LOGGER.warn("is not image: " + stringURL); - } - } - - } catch (IOException e) { - ImageRegister.registerError(stringURL); - MarumaSign.LOGGER.warn("Failure: " + stringURL); - // 原因を表示 - MarumaSign.LOGGER.error(e.getMessage(), e); - } - } - - // URLを Identifier で使える ID に変換 - public static String URLtoPath(String stringURL) { - String path; - if (stringURL.length() > 150) { - try { - java.security.MessageDigest digest = java.security.MessageDigest.getInstance("SHA-256"); - byte[] hash = digest.digest(stringURL.getBytes(java.nio.charset.StandardCharsets.UTF_8)); - path = "hash_" + BaseEncoding.base32().encode(hash).toLowerCase().replace('=', '_'); - } catch (java.security.NoSuchAlgorithmException e) { - path = BaseEncoding.base32().encode(stringURL.getBytes()).toLowerCase().replace('=', '_'); - } - } else { - path = BaseEncoding.base32().encode(stringURL.getBytes()).toLowerCase().replace('=', '_'); - } - return path; - } -} diff --git a/src/main/java/marumasa/marumasa_sign/mixin/BlockStateBaseMixin.java b/src/main/java/marumasa/marumasa_sign/mixin/BlockStateBaseMixin.java deleted file mode 100644 index f3468bec..00000000 --- a/src/main/java/marumasa/marumasa_sign/mixin/BlockStateBaseMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package marumasa.marumasa_sign.mixin; - -import marumasa.marumasa_sign.util.SignRenderCanceledThreadLocal; -import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.state.BlockState; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(targets = "net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase") -public class BlockStateBaseMixin { - - @Inject(method = "getRenderShape", at = @At("HEAD"), cancellable = true) - private void onGetRenderShape(CallbackInfoReturnable cir) { - BlockState state = (BlockState) (Object) this; - if (SignRenderCanceledThreadLocal.targetState.get() == state) { - SignRenderCanceledThreadLocal.targetState.set(null); - cir.setReturnValue(RenderShape.INVISIBLE); - } - } -} diff --git a/src/main/java/marumasa/marumasa_sign/mixin/RenderSectionRegionMixin.java b/src/main/java/marumasa/marumasa_sign/mixin/RenderSectionRegionMixin.java deleted file mode 100644 index f9a28feb..00000000 --- a/src/main/java/marumasa/marumasa_sign/mixin/RenderSectionRegionMixin.java +++ /dev/null @@ -1,42 +0,0 @@ -package marumasa.marumasa_sign.mixin; - -import marumasa.marumasa_sign.client.sign.CustomSignProvider; -import marumasa.marumasa_sign.model.CustomSign; -import marumasa.marumasa_sign.util.SignRenderCanceledThreadLocal; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.BlockAndTintGetter; -import net.minecraft.client.renderer.chunk.RenderSectionRegion; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.SignBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(RenderSectionRegion.class) -public class RenderSectionRegionMixin { - - @Inject(method = "getBlockState", at = @At("RETURN"), cancellable = true) - private void onGetBlockState(BlockPos pos, CallbackInfoReturnable cir) { - SignRenderCanceledThreadLocal.targetState.set(null); - - BlockState state = cir.getReturnValue(); - if (state != null && state.getBlock() instanceof SignBlock) { - final Minecraft client = Minecraft.getInstance(); - if (client.player != null && client.player.isSpectator()) { - return; - } - - BlockEntity blockEntity = ((BlockAndTintGetter) (Object) this).getBlockEntity(pos); - if (blockEntity instanceof SignBlockEntity signBlockEntity) { - final String signText = CustomSign.read(signBlockEntity); - if (CustomSignProvider.toParameters(signText) != null) { - SignRenderCanceledThreadLocal.targetState.set(state); - } - } - } - } -} diff --git a/src/main/java/marumasa/marumasa_sign/mixin/SignBlockEntityMixin.java b/src/main/java/marumasa/marumasa_sign/mixin/SignBlockEntityMixin.java deleted file mode 100644 index 31b99184..00000000 --- a/src/main/java/marumasa/marumasa_sign/mixin/SignBlockEntityMixin.java +++ /dev/null @@ -1,62 +0,0 @@ -package marumasa.marumasa_sign.mixin; - -import marumasa.marumasa_sign.model.CustomSign; -import marumasa.marumasa_sign.model.CustomSignHolder; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.world.level.block.entity.SignText; -import net.minecraft.world.phys.AABB; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; - -@Mixin(SignBlockEntity.class) -public class SignBlockEntityMixin implements CustomSignHolder { - @Unique - private CustomSign customSign; - @Unique - private SignText lastFrontText; - @Unique - private SignText lastBackText; - @Unique - private AABB customSignAABB; - - @Override - public CustomSign marumasa$getCustomSign() { - return this.customSign; - } - - @Override - public void marumasa$setCustomSign(CustomSign customSign) { - this.customSign = customSign; - this.customSignAABB = null; - } - - @Override - public SignText marumasa$getLastFrontText() { - return this.lastFrontText; - } - - @Override - public void marumasa$setLastFrontText(SignText frontText) { - this.lastFrontText = frontText; - } - - @Override - public SignText marumasa$getLastBackText() { - return this.lastBackText; - } - - @Override - public void marumasa$setLastBackText(SignText backText) { - this.lastBackText = backText; - } - - @Override - public AABB marumasa$getCustomSignAABB() { - return this.customSignAABB; - } - - @Override - public void marumasa$setCustomSignAABB(AABB aabb) { - this.customSignAABB = aabb; - } -} diff --git a/src/main/java/marumasa/marumasa_sign/mixin/SignEditScreenAccessor.java b/src/main/java/marumasa/marumasa_sign/mixin/SignEditScreenAccessor.java deleted file mode 100644 index a594952e..00000000 --- a/src/main/java/marumasa/marumasa_sign/mixin/SignEditScreenAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package marumasa.marumasa_sign.mixin; - -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen; -import org.spongepowered.asm.mixin.gen.Accessor; - -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(AbstractSignEditScreen.class) -public interface SignEditScreenAccessor { - @Accessor("sign") - SignBlockEntity getBlockEntity(); -} diff --git a/src/main/java/marumasa/marumasa_sign/model/CustomSign.java b/src/main/java/marumasa/marumasa_sign/model/CustomSign.java deleted file mode 100644 index b582a6da..00000000 --- a/src/main/java/marumasa/marumasa_sign/model/CustomSign.java +++ /dev/null @@ -1,152 +0,0 @@ -package marumasa.marumasa_sign.model; - -import marumasa.marumasa_sign.util.Utils; -import marumasa.marumasa_sign.client.sign.CustomSignProvider; -import marumasa.marumasa_sign.animation.GifPlayer; -import net.minecraft.world.level.block.entity.SignBlockEntity; -import net.minecraft.client.renderer.rendertype.RenderType; -import net.minecraft.network.chat.Component; -import org.joml.Vector2f; -import org.joml.Vector3f; - -public class CustomSign { - - private final RenderType renderLayer; - public final Vertex vertex; - public final String stringURL; - private final long startTime; - private final double viewDistance; - private final boolean isAnimated; - private final boolean isLoading; - private final int cacheVersion; - - public CustomSign(TextureURL textureURL, Object[] parameters) { - this(new CustomSignParameters( - textureURL, - (parameters != null && parameters.length > 1) ? (float) parameters[1] : 0.0f, - (parameters != null && parameters.length > 2) ? (float) parameters[2] : 0.0f, - (parameters != null && parameters.length > 3) ? (float) parameters[3] : 0.0f, - (parameters != null && parameters.length > 4) ? (float) parameters[4] : 1.0f, - (parameters != null && parameters.length > 5) ? (float) parameters[5] : 1.0f, - (parameters != null && parameters.length > 6) ? (float) parameters[6] : 0.0f, - (parameters != null && parameters.length > 7) ? (float) parameters[7] : 0.0f, - (parameters != null && parameters.length > 8) ? (float) parameters[8] : 0.0f - ), (parameters != null && parameters.length > 0) ? (String) parameters[0] : ""); - } - - public CustomSign(CustomSignParameters csp, String stringURL) { - this.stringURL = stringURL; - this.startTime = System.currentTimeMillis(); - this.cacheVersion = CustomSignProvider.cacheVersion; - - // getEntityTranslucent で 透過と半透明と裏面表示 対応の RenderLayer 生成 - this.renderLayer = Utils.getRenderLayer(csp.textureURL != null ? csp.textureURL.identifier() : TextureURL.error.identifier()); - - final int width = csp.textureURL != null ? csp.textureURL.width() : 1; - final int height = csp.textureURL != null ? csp.textureURL.height() : 1; - // 頂点の位置 設定 - - double maxVal = Math.max(width, height); - if (maxVal <= 0.0) { - maxVal = 1.0; - } - Vector2f vec = new Vector2f( - (float) (width / maxVal), - (float) (height / maxVal) - ); - - vec.mul(csp.ScaleX, csp.ScaleY); - - this.vertex = new Vertex( - csp.createVertex(-vec.x, -vec.y), - csp.createVertex(-vec.x, +vec.y), - csp.createVertex(+vec.x, +vec.y), - csp.createVertex(+vec.x, -vec.y) - ); - - double maxDistSqr = 0; - maxDistSqr = Math.max(maxDistSqr, this.vertex.mi_mi().lengthSquared()); - maxDistSqr = Math.max(maxDistSqr, this.vertex.mi_pl().lengthSquared()); - maxDistSqr = Math.max(maxDistSqr, this.vertex.pl_pl().lengthSquared()); - maxDistSqr = Math.max(maxDistSqr, this.vertex.pl_mi().lengthSquared()); - double maxOffset = Math.sqrt(maxDistSqr); - this.viewDistance = Math.min(512.0, 64.0 + maxOffset * 2.0); - this.isAnimated = GifPlayer.gifMap.containsKey(stringURL); - this.isLoading = (csp.textureURL == TextureURL.loading); - } - - public RenderType getRenderLayer() { - if (!this.isAnimated) { - return this.renderLayer; - } - return GifPlayer.getRenderType(this.stringURL, this.renderLayer, this.startTime); - } - - public double getViewDistance() { - return viewDistance; - } - - public boolean isLoading() { - return isLoading; - } - - public int getCacheVersion() { - return cacheVersion; - } - - public static String read(SignBlockEntity sign) { - final StringBuilder stringAll = new StringBuilder(); - - // 表面のテキストを結合 - for (int i = 0; i < 4; i++) { - stringAll.append(sign.getFrontText().getMessage(i, false).getString()); - } - // 裏面のテキストを結合 - for (int i = 0; i < 4; i++) { - stringAll.append(sign.getBackText().getMessage(i, false).getString()); - } - - return stringAll.toString(); - } - - public static CustomSign create(TextureURL textureURL, Object[] parameters) { - return new CustomSign(textureURL, parameters); - } - - public record CustomSignParameters( - // 画像のURL - TextureURL textureURL, - // 位置 - float TranslationX, - float TranslationY, - float TranslationZ, - // 大きさ - float ScaleX, - float ScaleY, - // 回転 - float Roll, - float Yaw, - float Pitch - ) { - public Vector3f createVertex(float x, float y) { - Vector3f vec = new Vector3f(x, y, 0); - - vec.rotateX((float) Math.toRadians(Pitch)); - vec.rotateY((float) Math.toRadians(-Yaw)); - vec.rotateZ((float) Math.toRadians(-Roll)); - - vec.add(TranslationX * 2, TranslationY * 2, TranslationZ * 2); - - return vec; - } - } - - - public record Vertex( - Vector3f mi_mi, - Vector3f mi_pl, - Vector3f pl_pl, - Vector3f pl_mi - ) { - } -} diff --git a/src/main/java/marumasa/marumasa_sign/model/CustomSignHolder.java b/src/main/java/marumasa/marumasa_sign/model/CustomSignHolder.java deleted file mode 100644 index 103aac72..00000000 --- a/src/main/java/marumasa/marumasa_sign/model/CustomSignHolder.java +++ /dev/null @@ -1,16 +0,0 @@ -package marumasa.marumasa_sign.model; - -import net.minecraft.world.level.block.entity.SignText; -import net.minecraft.world.phys.AABB; - -public interface CustomSignHolder { - CustomSign marumasa$getCustomSign(); - void marumasa$setCustomSign(CustomSign customSign); - SignText marumasa$getLastFrontText(); - void marumasa$setLastFrontText(SignText frontText); - SignText marumasa$getLastBackText(); - void marumasa$setLastBackText(SignText backText); - - AABB marumasa$getCustomSignAABB(); - void marumasa$setCustomSignAABB(AABB aabb); -} diff --git a/src/main/java/marumasa/marumasa_sign/model/TextureURL.java b/src/main/java/marumasa/marumasa_sign/model/TextureURL.java deleted file mode 100644 index a00049e9..00000000 --- a/src/main/java/marumasa/marumasa_sign/model/TextureURL.java +++ /dev/null @@ -1,17 +0,0 @@ -package marumasa.marumasa_sign.model; - -import marumasa.marumasa_sign.MarumaSign; -import net.minecraft.resources.Identifier; - -public record TextureURL(Identifier identifier, int width, int height) { - - // 読み込み中のテクスチャ - public static final TextureURL loading = new TextureURL( - Identifier.fromNamespaceAndPath(MarumaSign.MOD_ID, "textures/misc/loading.png"), 160, 96 - ); - - // 読み込み失敗のテクスチャ - public static final TextureURL error = new TextureURL( - Identifier.fromNamespaceAndPath(MarumaSign.MOD_ID, "textures/misc/error.png"), 160, 96 - ); -} diff --git a/src/main/java/marumasa/marumasa_sign/util/PortManager.java b/src/main/java/marumasa/marumasa_sign/util/PortManager.java deleted file mode 100644 index b12b19d4..00000000 --- a/src/main/java/marumasa/marumasa_sign/util/PortManager.java +++ /dev/null @@ -1,14 +0,0 @@ -package marumasa.marumasa_sign.util; - -public class PortManager { - - public static int generate() { - // ポート番号をOSに自動割り当てしてもらう - try (java.net.ServerSocket socket = new java.net.ServerSocket(0)) { - return socket.getLocalPort(); - } catch (java.io.IOException e) { - // 万が一失敗した場合はデフォルトのポート - return 2071; - } - } -} diff --git a/src/main/java/marumasa/marumasa_sign/util/SignRenderCanceledThreadLocal.java b/src/main/java/marumasa/marumasa_sign/util/SignRenderCanceledThreadLocal.java deleted file mode 100644 index e41acf8f..00000000 --- a/src/main/java/marumasa/marumasa_sign/util/SignRenderCanceledThreadLocal.java +++ /dev/null @@ -1,7 +0,0 @@ -package marumasa.marumasa_sign.util; - -import net.minecraft.world.level.block.state.BlockState; - -public class SignRenderCanceledThreadLocal { - public static final ThreadLocal targetState = new ThreadLocal<>(); -} diff --git a/src/main/java/marumasa/marumasa_sign/util/Utils.java b/src/main/java/marumasa/marumasa_sign/util/Utils.java deleted file mode 100644 index 7d7b018f..00000000 --- a/src/main/java/marumasa/marumasa_sign/util/Utils.java +++ /dev/null @@ -1,220 +0,0 @@ -package marumasa.marumasa_sign.util; - -import marumasa.marumasa_sign.MarumaSign; -import net.minecraft.client.Minecraft; -import net.minecraft.client.KeyMapping; -import net.minecraft.client.renderer.rendertype.RenderType; -import net.minecraft.client.renderer.rendertype.RenderTypes; -import com.mojang.blaze3d.platform.NativeImage; -import net.minecraft.client.renderer.texture.DynamicTexture; -import com.mojang.blaze3d.platform.InputConstants; -import net.minecraft.resources.Identifier; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.*; -import java.lang.reflect.Method; -import java.net.HttpURLConnection; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Base64; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; - -public class Utils { - - private static final Minecraft client = Minecraft.getInstance(); - - public static boolean isGif(byte[] bytes) { - if (bytes == null || bytes.length < 6) return false; - byte[] header = Arrays.copyOf(bytes, 6); - String s = new String(header); - return s.equals("GIF89a"); - } - - public static boolean isWebp(byte[] bytes) { - if (bytes == null || bytes.length < 12) return false; - return bytes[0] == 'R' && bytes[1] == 'I' && bytes[2] == 'F' && bytes[3] == 'F' - && bytes[8] == 'W' && bytes[9] == 'E' && bytes[10] == 'B' && bytes[11] == 'P'; - } - - public static boolean isAnimatedWebp(byte[] bytes) { - if (!isWebp(bytes)) return false; - int pos = 12; - while (pos < bytes.length - 8) { - String type = new String(bytes, pos, 4, StandardCharsets.US_ASCII); - int size = (bytes[pos + 4] & 0xFF) | ((bytes[pos + 5] & 0xFF) << 8) - | ((bytes[pos + 6] & 0xFF) << 16) | ((bytes[pos + 7] & 0xFF) << 24); - if (type.equals("VP8X")) { - if (pos + 8 < bytes.length) { - int flags = bytes[pos + 8] & 0xFF; - return (flags & 0x02) != 0; - } - } - pos += 8 + size; - if (size % 2 != 0) { - pos++; - } - if (size < 0) break; - } - return false; - } - - public static boolean isApng(byte[] bytes) { - if (bytes == null || bytes.length < 8) return false; - byte[] pngSig = {(byte) 137, 80, 78, 71, 13, 10, 26, 10}; - for (int i = 0; i < 8; i++) { - if (bytes[i] != pngSig[i]) return false; - } - int pos = 8; - while (pos < bytes.length - 8) { - int length = ((bytes[pos] & 0xFF) << 24) | ((bytes[pos + 1] & 0xFF) << 16) - | ((bytes[pos + 2] & 0xFF) << 8) | (bytes[pos + 3] & 0xFF); - if (pos + 4 >= bytes.length) break; - String type = new String(bytes, pos + 4, 4, StandardCharsets.US_ASCII); - if (type.equals("acTL")) { - return true; - } - pos += 8 + length + 4; - if (length < 0) break; // prevent infinite loop - } - return false; - } - - public static void registerTexture(Identifier id, int width, int height, int[] pixels) throws IOException { - NativeImage image = new NativeImage(width, height, false); - for (int y = 0; y < height; y++) { - for (int x = 0; x < width; x++) { - int argb = pixels[x + y * width]; - image.setPixel(x, y, argb); - } - } - registerTexture(id, image); - } - - public static RenderType getRenderLayer(Identifier identifier) { - return RenderTypes.entityTranslucent(identifier); - } - - public static String encodeURL(String url) { - try { - URI uri = new URI(url); - return uri.toASCIIString(); - } catch (URISyntaxException e) { - return null; - } - } - - public static void registerTexture(Identifier id, BufferedImage image) throws IOException { - - // BufferedImageをbyte配列に変換する - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - ImageIO.write(image, "png", stream); - byte[] bytes = stream.toByteArray(); - - // テクスチャ 登録 - registerTexture(id, NativeImage.read(new ByteArrayInputStream(bytes))); - } - - public static final KeyMapping.Category CATEGORY = KeyMapping.Category.register(Identifier.fromNamespaceAndPath(MarumaSign.MOD_ID, "key_category")); - - public static void registerTexture(Identifier id, NativeImage image) { - // テクスチャ 登録 - client.getTextureManager().register(id, new DynamicTexture(() -> "marumasasign_texture", image)); - } - - public static void destroyTexture(Identifier id) { - // テクスチャ 削除 - client.getTextureManager().release(id); - } - - // キーバインド 作成 - public static KeyMapping createKeyBinding(String name, int code) { - return new KeyMapping( - // ID作成 - "key." + MarumaSign.MOD_ID + "." + name, - - // どのキーか設定 - InputConstants.Type.KEYSYM, code, - - // カテゴリ設定 - CATEGORY - ); - } - - public static InputStream toPNG(InputStream inputStream) { - try { - // InputStream を BufferedImage に読み込む - final BufferedImage bufferedImage = ImageIO.read(inputStream); - - // BufferedImage を PNG 形式の OutputStream に書き込む - final ByteArrayOutputStream pngOutputStream = new ByteArrayOutputStream(); - ImageIO.write(bufferedImage, "png", pngOutputStream); - // PNG 形式の OutputStream から ByteArrayInputStream を作成して return - return new ByteArrayInputStream(pngOutputStream.toByteArray()); - } catch (IOException | IllegalArgumentException e) { - return null; - } - } - - private static final Base64.Decoder decoder = Base64.getDecoder(); - - public static byte[] Base64Decoder(String base64) { - return decoder.decode(base64); - } - - public static String UploadFile(String url, byte[] fileBytes, String filename) throws IOException { - String sanitizedFilename = filename == null ? "file.png" : filename.replace("\"", "").replace("\r", "").replace("\n", ""); - - // POSTリクエストのボディを作成する - String boundary = Long.toHexString(System.currentTimeMillis()); // ランダムなバウンダリーを生成 - String CRLF = "\r\n"; // 改行 - - HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); - conn.setConnectTimeout(5000); - conn.setReadTimeout(5000); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary); - - try ( - OutputStream output = conn.getOutputStream(); - PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8), true); - ) { - // ファイルデータの書き込み - writer.append("--").append(boundary).append(CRLF); - writer.append("Content-Disposition: form-data; name=\"reqtype\"").append(CRLF); - writer.append(CRLF).append("fileupload").append(CRLF); - - writer.append("--").append(boundary).append(CRLF); - writer.append("Content-Disposition: form-data; name=\"fileToUpload\"; filename=\"").append(sanitizedFilename).append("\"").append(CRLF); - writer.append("Content-Type: image/png").append(CRLF); - writer.append(CRLF).flush(); - - output.write(fileBytes); - output.flush(); - - writer.append(CRLF); - writer.append("--").append(boundary).append("--").append(CRLF); - } - - // レスポンスの取得 - int responseCode = conn.getResponseCode(); - MarumaSign.LOGGER.info("Response Code: %d".formatted(responseCode)); - - try ( - BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); - ) { - String inputLine; - StringBuilder response = new StringBuilder(); - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - MarumaSign.LOGGER.info("Response Body: %s".formatted(response)); - return response.toString(); - } - } -} diff --git a/src/main/resources/assets/marumasa_sign/lang/en_us.json b/src/main/resources/assets/marumasa_sign/lang/en_us.json deleted file mode 100644 index 0519149e..00000000 --- a/src/main/resources/assets/marumasa_sign/lang/en_us.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "text.maruma_sign.remove_cache": "I deleted the cache.", - "text.maruma_sign.open_menu": "Open WebUI...", - "key.marumasa_sign.open_menu": "Open WebUI", - "key.marumasa_sign.remove_cache": "Delete cache", - "key.categories.marumasa_sign": "MarumaSign", - "text.maruma_sign.remove_cache_tooltip": "Delete Image Cache of MarumaSign", - "text.maruma_sign.asyncprocessnum": " Simultaneous image loads", - "text.maruma_sign.close": "Close", - "text.maruma_sign.write_mode": "Signboard writing mode has been entered" -} diff --git a/src/main/resources/assets/marumasa_sign/lang/ja_jp.json b/src/main/resources/assets/marumasa_sign/lang/ja_jp.json deleted file mode 100644 index 9c501da7..00000000 --- a/src/main/resources/assets/marumasa_sign/lang/ja_jp.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "text.maruma_sign.remove_cache": "キャッシュを削除しました", - "text.maruma_sign.open_menu": "WebUIを開いています...", - "key.marumasa_sign.open_menu": "WebUIを開く", - "key.marumasa_sign.remove_cache": "キャッシュを削除する", - "key.categories.marumasa_sign": "MarumaSign", - "text.maruma_sign.remove_cache_tooltip": "MarumaSignの画像キャッシュをすべて削除します", - "text.maruma_sign.asyncprocessnum": "画像の同時ロード数", - "text.maruma_sign.close": "閉じる", - "text.maruma_sign.write_mode": "看板書き込みモードになりました。看板を設置してください。" -} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json deleted file mode 100644 index ef5238a9..00000000 --- a/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "schemaVersion": 1, - "id": "marumasa_sign", - "version": "${version}", - "name": "MarumaSign", - "description": "", - "authors": [], - "contact": { - "repo": "https://github.com/TORO-Server/MarumaSign" - }, - "license": "MIT", - "icon": "assets/marumasa_sign/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "marumasa.marumasa_sign.client.MarumaSignClient" - ], - "main": [ - "marumasa.marumasa_sign.MarumaSign" - ] - }, - "mixins": [ - "marumasa_sign.mixins.json" - ], - "depends": { - "fabricloader": ">=${loader_version}", - "fabric-api": "*", - "minecraft": "${minecraft_version}" - } -} diff --git a/src/main/resources/marumasa_sign.mixins.json b/src/main/resources/marumasa_sign.mixins.json deleted file mode 100644 index a684c947..00000000 --- a/src/main/resources/marumasa_sign.mixins.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "marumasa.marumasa_sign.mixin", - "compatibilityLevel": "JAVA_25", - "mixins": [ - "SignEditScreenAccessor", - "BlockStateBaseMixin", - "SignBlockEntityMixin" - ], - "client": [ - "RenderSectionRegionMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/src/main/resources/webui/bootstrap.min.css b/src/main/resources/webui/bootstrap.min.css deleted file mode 100644 index f5910acc..00000000 --- a/src/main/resources/webui/bootstrap.min.css +++ /dev/null @@ -1,6 +0,0 @@ -@charset "UTF-8";/*! - * Bootstrap v5.3.2 (https://getbootstrap.com/) - * Copyright 2011-2023 The Bootstrap Authors - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) - */:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray-900:#212529;--bs-primary:#0d6efd;--bs-secondary:#6c757d;--bs-success:#198754;--bs-info:#0dcaf0;--bs-warning:#ffc107;--bs-danger:#dc3545;--bs-light:#f8f9fa;--bs-dark:#212529;--bs-primary-rgb:13,110,253;--bs-secondary-rgb:108,117,125;--bs-success-rgb:25,135,84;--bs-info-rgb:13,202,240;--bs-warning-rgb:255,193,7;--bs-danger-rgb:220,53,69;--bs-light-rgb:248,249,250;--bs-dark-rgb:33,37,41;--bs-primary-text-emphasis:#052c65;--bs-secondary-text-emphasis:#2b2f32;--bs-success-text-emphasis:#0a3622;--bs-info-text-emphasis:#055160;--bs-warning-text-emphasis:#664d03;--bs-danger-text-emphasis:#58151c;--bs-light-text-emphasis:#495057;--bs-dark-text-emphasis:#495057;--bs-primary-bg-subtle:#cfe2ff;--bs-secondary-bg-subtle:#e2e3e5;--bs-success-bg-subtle:#d1e7dd;--bs-info-bg-subtle:#cff4fc;--bs-warning-bg-subtle:#fff3cd;--bs-danger-bg-subtle:#f8d7da;--bs-light-bg-subtle:#fcfcfd;--bs-dark-bg-subtle:#ced4da;--bs-primary-border-subtle:#9ec5fe;--bs-secondary-border-subtle:#c4c8cb;--bs-success-border-subtle:#a3cfbb;--bs-info-border-subtle:#9eeaf9;--bs-warning-border-subtle:#ffe69c;--bs-danger-border-subtle:#f1aeb5;--bs-light-border-subtle:#e9ecef;--bs-dark-border-subtle:#adb5bd;--bs-white-rgb:255,255,255;--bs-black-rgb:0,0,0;--bs-font-sans-serif:system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--bs-font-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--bs-gradient:linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));--bs-body-font-family:var(--bs-font-sans-serif);--bs-body-font-size:1rem;--bs-body-font-weight:400;--bs-body-line-height:1.5;--bs-body-color:#212529;--bs-body-color-rgb:33,37,41;--bs-body-bg:#fff;--bs-body-bg-rgb:255,255,255;--bs-emphasis-color:#000;--bs-emphasis-color-rgb:0,0,0;--bs-secondary-color:rgba(33, 37, 41, 0.75);--bs-secondary-color-rgb:33,37,41;--bs-secondary-bg:#e9ecef;--bs-secondary-bg-rgb:233,236,239;--bs-tertiary-color:rgba(33, 37, 41, 0.5);--bs-tertiary-color-rgb:33,37,41;--bs-tertiary-bg:#f8f9fa;--bs-tertiary-bg-rgb:248,249,250;--bs-heading-color:inherit;--bs-link-color:#0d6efd;--bs-link-color-rgb:13,110,253;--bs-link-decoration:underline;--bs-link-hover-color:#0a58ca;--bs-link-hover-color-rgb:10,88,202;--bs-code-color:#d63384;--bs-highlight-color:#212529;--bs-highlight-bg:#fff3cd;--bs-border-width:1px;--bs-border-style:solid;--bs-border-color:#dee2e6;--bs-border-color-translucent:rgba(0, 0, 0, 0.175);--bs-border-radius:0.375rem;--bs-border-radius-sm:0.25rem;--bs-border-radius-lg:0.5rem;--bs-border-radius-xl:1rem;--bs-border-radius-xxl:2rem;--bs-border-radius-2xl:var(--bs-border-radius-xxl);--bs-border-radius-pill:50rem;--bs-box-shadow:0 0.5rem 1rem rgba(0, 0, 0, 0.15);--bs-box-shadow-sm:0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);--bs-box-shadow-lg:0 1rem 3rem rgba(0, 0, 0, 0.175);--bs-box-shadow-inset:inset 0 1px 2px rgba(0, 0, 0, 0.075);--bs-focus-ring-width:0.25rem;--bs-focus-ring-opacity:0.25;--bs-focus-ring-color:rgba(13, 110, 253, 0.25);--bs-form-valid-color:#198754;--bs-form-valid-border-color:#198754;--bs-form-invalid-color:#dc3545;--bs-form-invalid-border-color:#dc3545}[data-bs-theme=dark]{color-scheme:dark;--bs-body-color:#dee2e6;--bs-body-color-rgb:222,226,230;--bs-body-bg:#212529;--bs-body-bg-rgb:33,37,41;--bs-emphasis-color:#fff;--bs-emphasis-color-rgb:255,255,255;--bs-secondary-color:rgba(222, 226, 230, 0.75);--bs-secondary-color-rgb:222,226,230;--bs-secondary-bg:#343a40;--bs-secondary-bg-rgb:52,58,64;--bs-tertiary-color:rgba(222, 226, 230, 0.5);--bs-tertiary-color-rgb:222,226,230;--bs-tertiary-bg:#2b3035;--bs-tertiary-bg-rgb:43,48,53;--bs-primary-text-emphasis:#6ea8fe;--bs-secondary-text-emphasis:#a7acb1;--bs-success-text-emphasis:#75b798;--bs-info-text-emphasis:#6edff6;--bs-warning-text-emphasis:#ffda6a;--bs-danger-text-emphasis:#ea868f;--bs-light-text-emphasis:#f8f9fa;--bs-dark-text-emphasis:#dee2e6;--bs-primary-bg-subtle:#031633;--bs-secondary-bg-subtle:#161719;--bs-success-bg-subtle:#051b11;--bs-info-bg-subtle:#032830;--bs-warning-bg-subtle:#332701;--bs-danger-bg-subtle:#2c0b0e;--bs-light-bg-subtle:#343a40;--bs-dark-bg-subtle:#1a1d20;--bs-primary-border-subtle:#084298;--bs-secondary-border-subtle:#41464b;--bs-success-border-subtle:#0f5132;--bs-info-border-subtle:#087990;--bs-warning-border-subtle:#997404;--bs-danger-border-subtle:#842029;--bs-light-border-subtle:#495057;--bs-dark-border-subtle:#343a40;--bs-heading-color:inherit;--bs-link-color:#6ea8fe;--bs-link-hover-color:#8bb9fe;--bs-link-color-rgb:110,168,254;--bs-link-hover-color-rgb:139,185,254;--bs-code-color:#e685b5;--bs-highlight-color:#dee2e6;--bs-highlight-bg:#664d03;--bs-border-color:#495057;--bs-border-color-translucent:rgba(255, 255, 255, 0.15);--bs-form-valid-color:#75b798;--bs-form-valid-border-color:#75b798;--bs-form-invalid-color:#ea868f;--bs-form-invalid-border-color:#ea868f}*,::after,::before{box-sizing:border-box}@media (prefers-reduced-motion:no-preference){:root{scroll-behavior:smooth}}body{margin:0;font-family:var(--bs-body-font-family);font-size:var(--bs-body-font-size);font-weight:var(--bs-body-font-weight);line-height:var(--bs-body-line-height);color:var(--bs-body-color);text-align:var(--bs-body-text-align);background-color:var(--bs-body-bg);-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}hr{margin:1rem 0;color:inherit;border:0;border-top:var(--bs-border-width) solid;opacity:.25}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2;color:var(--bs-heading-color)}.h1,h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){.h1,h1{font-size:2.5rem}}.h2,h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){.h2,h2{font-size:2rem}}.h3,h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){.h3,h3{font-size:1.75rem}}.h4,h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){.h4,h4{font-size:1.5rem}}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-left:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}.small,small{font-size:.875em}.mark,mark{padding:.1875em;color:var(--bs-highlight-color);background-color:var(--bs-highlight-bg)}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,1));text-decoration:underline}a:hover{--bs-link-color-rgb:var(--bs-link-hover-color-rgb)}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:var(--bs-font-monospace);font-size:1em}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:var(--bs-code-color);word-wrap:break-word}a>code{color:inherit}kbd{padding:.1875rem .375rem;font-size:.875em;color:var(--bs-body-bg);background-color:var(--bs-body-color);border-radius:.25rem}kbd kbd{padding:0;font-size:1em}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:var(--bs-secondary-color);text-align:left}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}select:disabled{opacity:1}[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator{display:none!important}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:left;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:left}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}::file-selector-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:calc(1.625rem + 4.5vw);font-weight:300;line-height:1.2}@media (min-width:1200px){.display-1{font-size:5rem}}.display-2{font-size:calc(1.575rem + 3.9vw);font-weight:300;line-height:1.2}@media (min-width:1200px){.display-2{font-size:4.5rem}}.display-3{font-size:calc(1.525rem + 3.3vw);font-weight:300;line-height:1.2}@media (min-width:1200px){.display-3{font-size:4rem}}.display-4{font-size:calc(1.475rem + 2.7vw);font-weight:300;line-height:1.2}@media (min-width:1200px){.display-4{font-size:3.5rem}}.display-5{font-size:calc(1.425rem + 2.1vw);font-weight:300;line-height:1.2}@media (min-width:1200px){.display-5{font-size:3rem}}.display-6{font-size:calc(1.375rem + 1.5vw);font-weight:300;line-height:1.2}@media (min-width:1200px){.display-6{font-size:2.5rem}}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:.875em;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote>:last-child{margin-bottom:0}.blockquote-footer{margin-top:-1rem;margin-bottom:1rem;font-size:.875em;color:#6c757d}.blockquote-footer::before{content:"— "}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:var(--bs-body-bg);border:var(--bs-border-width) solid var(--bs-border-color);border-radius:var(--bs-border-radius);max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:.875em;color:var(--bs-secondary-color)}.container,.container-fluid,.container-lg,.container-md,.container-sm,.container-xl,.container-xxl{--bs-gutter-x:1.5rem;--bs-gutter-y:0;width:100%;padding-right:calc(var(--bs-gutter-x) * .5);padding-left:calc(var(--bs-gutter-x) * .5);margin-right:auto;margin-left:auto}@media (min-width:576px){.container,.container-sm{max-width:540px}}@media (min-width:768px){.container,.container-md,.container-sm{max-width:720px}}@media (min-width:992px){.container,.container-lg,.container-md,.container-sm{max-width:960px}}@media (min-width:1200px){.container,.container-lg,.container-md,.container-sm,.container-xl{max-width:1140px}}@media (min-width:1400px){.container,.container-lg,.container-md,.container-sm,.container-xl,.container-xxl{max-width:1320px}}:root{--bs-breakpoint-xs:0;--bs-breakpoint-sm:576px;--bs-breakpoint-md:768px;--bs-breakpoint-lg:992px;--bs-breakpoint-xl:1200px;--bs-breakpoint-xxl:1400px}.row{--bs-gutter-x:1.5rem;--bs-gutter-y:0;display:flex;flex-wrap:wrap;margin-top:calc(-1 * var(--bs-gutter-y));margin-right:calc(-.5 * var(--bs-gutter-x));margin-left:calc(-.5 * var(--bs-gutter-x))}.row>*{flex-shrink:0;width:100%;max-width:100%;padding-right:calc(var(--bs-gutter-x) * .5);padding-left:calc(var(--bs-gutter-x) * .5);margin-top:var(--bs-gutter-y)}.col{flex:1 0 0%}.row-cols-auto>*{flex:0 0 auto;width:auto}.row-cols-1>*{flex:0 0 auto;width:100%}.row-cols-2>*{flex:0 0 auto;width:50%}.row-cols-3>*{flex:0 0 auto;width:33.33333333%}.row-cols-4>*{flex:0 0 auto;width:25%}.row-cols-5>*{flex:0 0 auto;width:20%}.row-cols-6>*{flex:0 0 auto;width:16.66666667%}.col-auto{flex:0 0 auto;width:auto}.col-1{flex:0 0 auto;width:8.33333333%}.col-2{flex:0 0 auto;width:16.66666667%}.col-3{flex:0 0 auto;width:25%}.col-4{flex:0 0 auto;width:33.33333333%}.col-5{flex:0 0 auto;width:41.66666667%}.col-6{flex:0 0 auto;width:50%}.col-7{flex:0 0 auto;width:58.33333333%}.col-8{flex:0 0 auto;width:66.66666667%}.col-9{flex:0 0 auto;width:75%}.col-10{flex:0 0 auto;width:83.33333333%}.col-11{flex:0 0 auto;width:91.66666667%}.col-12{flex:0 0 auto;width:100%}.offset-1{margin-left:8.33333333%}.offset-2{margin-left:16.66666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.33333333%}.offset-5{margin-left:41.66666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.33333333%}.offset-8{margin-left:66.66666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.33333333%}.offset-11{margin-left:91.66666667%}.g-0,.gx-0{--bs-gutter-x:0}.g-0,.gy-0{--bs-gutter-y:0}.g-1,.gx-1{--bs-gutter-x:0.25rem}.g-1,.gy-1{--bs-gutter-y:0.25rem}.g-2,.gx-2{--bs-gutter-x:0.5rem}.g-2,.gy-2{--bs-gutter-y:0.5rem}.g-3,.gx-3{--bs-gutter-x:1rem}.g-3,.gy-3{--bs-gutter-y:1rem}.g-4,.gx-4{--bs-gutter-x:1.5rem}.g-4,.gy-4{--bs-gutter-y:1.5rem}.g-5,.gx-5{--bs-gutter-x:3rem}.g-5,.gy-5{--bs-gutter-y:3rem}@media (min-width:576px){.col-sm{flex:1 0 0%}.row-cols-sm-auto>*{flex:0 0 auto;width:auto}.row-cols-sm-1>*{flex:0 0 auto;width:100%}.row-cols-sm-2>*{flex:0 0 auto;width:50%}.row-cols-sm-3>*{flex:0 0 auto;width:33.33333333%}.row-cols-sm-4>*{flex:0 0 auto;width:25%}.row-cols-sm-5>*{flex:0 0 auto;width:20%}.row-cols-sm-6>*{flex:0 0 auto;width:16.66666667%}.col-sm-auto{flex:0 0 auto;width:auto}.col-sm-1{flex:0 0 auto;width:8.33333333%}.col-sm-2{flex:0 0 auto;width:16.66666667%}.col-sm-3{flex:0 0 auto;width:25%}.col-sm-4{flex:0 0 auto;width:33.33333333%}.col-sm-5{flex:0 0 auto;width:41.66666667%}.col-sm-6{flex:0 0 auto;width:50%}.col-sm-7{flex:0 0 auto;width:58.33333333%}.col-sm-8{flex:0 0 auto;width:66.66666667%}.col-sm-9{flex:0 0 auto;width:75%}.col-sm-10{flex:0 0 auto;width:83.33333333%}.col-sm-11{flex:0 0 auto;width:91.66666667%}.col-sm-12{flex:0 0 auto;width:100%}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.33333333%}.offset-sm-2{margin-left:16.66666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.33333333%}.offset-sm-5{margin-left:41.66666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.33333333%}.offset-sm-8{margin-left:66.66666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.33333333%}.offset-sm-11{margin-left:91.66666667%}.g-sm-0,.gx-sm-0{--bs-gutter-x:0}.g-sm-0,.gy-sm-0{--bs-gutter-y:0}.g-sm-1,.gx-sm-1{--bs-gutter-x:0.25rem}.g-sm-1,.gy-sm-1{--bs-gutter-y:0.25rem}.g-sm-2,.gx-sm-2{--bs-gutter-x:0.5rem}.g-sm-2,.gy-sm-2{--bs-gutter-y:0.5rem}.g-sm-3,.gx-sm-3{--bs-gutter-x:1rem}.g-sm-3,.gy-sm-3{--bs-gutter-y:1rem}.g-sm-4,.gx-sm-4{--bs-gutter-x:1.5rem}.g-sm-4,.gy-sm-4{--bs-gutter-y:1.5rem}.g-sm-5,.gx-sm-5{--bs-gutter-x:3rem}.g-sm-5,.gy-sm-5{--bs-gutter-y:3rem}}@media (min-width:768px){.col-md{flex:1 0 0%}.row-cols-md-auto>*{flex:0 0 auto;width:auto}.row-cols-md-1>*{flex:0 0 auto;width:100%}.row-cols-md-2>*{flex:0 0 auto;width:50%}.row-cols-md-3>*{flex:0 0 auto;width:33.33333333%}.row-cols-md-4>*{flex:0 0 auto;width:25%}.row-cols-md-5>*{flex:0 0 auto;width:20%}.row-cols-md-6>*{flex:0 0 auto;width:16.66666667%}.col-md-auto{flex:0 0 auto;width:auto}.col-md-1{flex:0 0 auto;width:8.33333333%}.col-md-2{flex:0 0 auto;width:16.66666667%}.col-md-3{flex:0 0 auto;width:25%}.col-md-4{flex:0 0 auto;width:33.33333333%}.col-md-5{flex:0 0 auto;width:41.66666667%}.col-md-6{flex:0 0 auto;width:50%}.col-md-7{flex:0 0 auto;width:58.33333333%}.col-md-8{flex:0 0 auto;width:66.66666667%}.col-md-9{flex:0 0 auto;width:75%}.col-md-10{flex:0 0 auto;width:83.33333333%}.col-md-11{flex:0 0 auto;width:91.66666667%}.col-md-12{flex:0 0 auto;width:100%}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.33333333%}.offset-md-2{margin-left:16.66666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.33333333%}.offset-md-5{margin-left:41.66666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.33333333%}.offset-md-8{margin-left:66.66666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.33333333%}.offset-md-11{margin-left:91.66666667%}.g-md-0,.gx-md-0{--bs-gutter-x:0}.g-md-0,.gy-md-0{--bs-gutter-y:0}.g-md-1,.gx-md-1{--bs-gutter-x:0.25rem}.g-md-1,.gy-md-1{--bs-gutter-y:0.25rem}.g-md-2,.gx-md-2{--bs-gutter-x:0.5rem}.g-md-2,.gy-md-2{--bs-gutter-y:0.5rem}.g-md-3,.gx-md-3{--bs-gutter-x:1rem}.g-md-3,.gy-md-3{--bs-gutter-y:1rem}.g-md-4,.gx-md-4{--bs-gutter-x:1.5rem}.g-md-4,.gy-md-4{--bs-gutter-y:1.5rem}.g-md-5,.gx-md-5{--bs-gutter-x:3rem}.g-md-5,.gy-md-5{--bs-gutter-y:3rem}}@media (min-width:992px){.col-lg{flex:1 0 0%}.row-cols-lg-auto>*{flex:0 0 auto;width:auto}.row-cols-lg-1>*{flex:0 0 auto;width:100%}.row-cols-lg-2>*{flex:0 0 auto;width:50%}.row-cols-lg-3>*{flex:0 0 auto;width:33.33333333%}.row-cols-lg-4>*{flex:0 0 auto;width:25%}.row-cols-lg-5>*{flex:0 0 auto;width:20%}.row-cols-lg-6>*{flex:0 0 auto;width:16.66666667%}.col-lg-auto{flex:0 0 auto;width:auto}.col-lg-1{flex:0 0 auto;width:8.33333333%}.col-lg-2{flex:0 0 auto;width:16.66666667%}.col-lg-3{flex:0 0 auto;width:25%}.col-lg-4{flex:0 0 auto;width:33.33333333%}.col-lg-5{flex:0 0 auto;width:41.66666667%}.col-lg-6{flex:0 0 auto;width:50%}.col-lg-7{flex:0 0 auto;width:58.33333333%}.col-lg-8{flex:0 0 auto;width:66.66666667%}.col-lg-9{flex:0 0 auto;width:75%}.col-lg-10{flex:0 0 auto;width:83.33333333%}.col-lg-11{flex:0 0 auto;width:91.66666667%}.col-lg-12{flex:0 0 auto;width:100%}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.33333333%}.offset-lg-2{margin-left:16.66666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.33333333%}.offset-lg-5{margin-left:41.66666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.33333333%}.offset-lg-8{margin-left:66.66666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.33333333%}.offset-lg-11{margin-left:91.66666667%}.g-lg-0,.gx-lg-0{--bs-gutter-x:0}.g-lg-0,.gy-lg-0{--bs-gutter-y:0}.g-lg-1,.gx-lg-1{--bs-gutter-x:0.25rem}.g-lg-1,.gy-lg-1{--bs-gutter-y:0.25rem}.g-lg-2,.gx-lg-2{--bs-gutter-x:0.5rem}.g-lg-2,.gy-lg-2{--bs-gutter-y:0.5rem}.g-lg-3,.gx-lg-3{--bs-gutter-x:1rem}.g-lg-3,.gy-lg-3{--bs-gutter-y:1rem}.g-lg-4,.gx-lg-4{--bs-gutter-x:1.5rem}.g-lg-4,.gy-lg-4{--bs-gutter-y:1.5rem}.g-lg-5,.gx-lg-5{--bs-gutter-x:3rem}.g-lg-5,.gy-lg-5{--bs-gutter-y:3rem}}@media (min-width:1200px){.col-xl{flex:1 0 0%}.row-cols-xl-auto>*{flex:0 0 auto;width:auto}.row-cols-xl-1>*{flex:0 0 auto;width:100%}.row-cols-xl-2>*{flex:0 0 auto;width:50%}.row-cols-xl-3>*{flex:0 0 auto;width:33.33333333%}.row-cols-xl-4>*{flex:0 0 auto;width:25%}.row-cols-xl-5>*{flex:0 0 auto;width:20%}.row-cols-xl-6>*{flex:0 0 auto;width:16.66666667%}.col-xl-auto{flex:0 0 auto;width:auto}.col-xl-1{flex:0 0 auto;width:8.33333333%}.col-xl-2{flex:0 0 auto;width:16.66666667%}.col-xl-3{flex:0 0 auto;width:25%}.col-xl-4{flex:0 0 auto;width:33.33333333%}.col-xl-5{flex:0 0 auto;width:41.66666667%}.col-xl-6{flex:0 0 auto;width:50%}.col-xl-7{flex:0 0 auto;width:58.33333333%}.col-xl-8{flex:0 0 auto;width:66.66666667%}.col-xl-9{flex:0 0 auto;width:75%}.col-xl-10{flex:0 0 auto;width:83.33333333%}.col-xl-11{flex:0 0 auto;width:91.66666667%}.col-xl-12{flex:0 0 auto;width:100%}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.33333333%}.offset-xl-2{margin-left:16.66666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.33333333%}.offset-xl-5{margin-left:41.66666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.33333333%}.offset-xl-8{margin-left:66.66666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.33333333%}.offset-xl-11{margin-left:91.66666667%}.g-xl-0,.gx-xl-0{--bs-gutter-x:0}.g-xl-0,.gy-xl-0{--bs-gutter-y:0}.g-xl-1,.gx-xl-1{--bs-gutter-x:0.25rem}.g-xl-1,.gy-xl-1{--bs-gutter-y:0.25rem}.g-xl-2,.gx-xl-2{--bs-gutter-x:0.5rem}.g-xl-2,.gy-xl-2{--bs-gutter-y:0.5rem}.g-xl-3,.gx-xl-3{--bs-gutter-x:1rem}.g-xl-3,.gy-xl-3{--bs-gutter-y:1rem}.g-xl-4,.gx-xl-4{--bs-gutter-x:1.5rem}.g-xl-4,.gy-xl-4{--bs-gutter-y:1.5rem}.g-xl-5,.gx-xl-5{--bs-gutter-x:3rem}.g-xl-5,.gy-xl-5{--bs-gutter-y:3rem}}@media (min-width:1400px){.col-xxl{flex:1 0 0%}.row-cols-xxl-auto>*{flex:0 0 auto;width:auto}.row-cols-xxl-1>*{flex:0 0 auto;width:100%}.row-cols-xxl-2>*{flex:0 0 auto;width:50%}.row-cols-xxl-3>*{flex:0 0 auto;width:33.33333333%}.row-cols-xxl-4>*{flex:0 0 auto;width:25%}.row-cols-xxl-5>*{flex:0 0 auto;width:20%}.row-cols-xxl-6>*{flex:0 0 auto;width:16.66666667%}.col-xxl-auto{flex:0 0 auto;width:auto}.col-xxl-1{flex:0 0 auto;width:8.33333333%}.col-xxl-2{flex:0 0 auto;width:16.66666667%}.col-xxl-3{flex:0 0 auto;width:25%}.col-xxl-4{flex:0 0 auto;width:33.33333333%}.col-xxl-5{flex:0 0 auto;width:41.66666667%}.col-xxl-6{flex:0 0 auto;width:50%}.col-xxl-7{flex:0 0 auto;width:58.33333333%}.col-xxl-8{flex:0 0 auto;width:66.66666667%}.col-xxl-9{flex:0 0 auto;width:75%}.col-xxl-10{flex:0 0 auto;width:83.33333333%}.col-xxl-11{flex:0 0 auto;width:91.66666667%}.col-xxl-12{flex:0 0 auto;width:100%}.offset-xxl-0{margin-left:0}.offset-xxl-1{margin-left:8.33333333%}.offset-xxl-2{margin-left:16.66666667%}.offset-xxl-3{margin-left:25%}.offset-xxl-4{margin-left:33.33333333%}.offset-xxl-5{margin-left:41.66666667%}.offset-xxl-6{margin-left:50%}.offset-xxl-7{margin-left:58.33333333%}.offset-xxl-8{margin-left:66.66666667%}.offset-xxl-9{margin-left:75%}.offset-xxl-10{margin-left:83.33333333%}.offset-xxl-11{margin-left:91.66666667%}.g-xxl-0,.gx-xxl-0{--bs-gutter-x:0}.g-xxl-0,.gy-xxl-0{--bs-gutter-y:0}.g-xxl-1,.gx-xxl-1{--bs-gutter-x:0.25rem}.g-xxl-1,.gy-xxl-1{--bs-gutter-y:0.25rem}.g-xxl-2,.gx-xxl-2{--bs-gutter-x:0.5rem}.g-xxl-2,.gy-xxl-2{--bs-gutter-y:0.5rem}.g-xxl-3,.gx-xxl-3{--bs-gutter-x:1rem}.g-xxl-3,.gy-xxl-3{--bs-gutter-y:1rem}.g-xxl-4,.gx-xxl-4{--bs-gutter-x:1.5rem}.g-xxl-4,.gy-xxl-4{--bs-gutter-y:1.5rem}.g-xxl-5,.gx-xxl-5{--bs-gutter-x:3rem}.g-xxl-5,.gy-xxl-5{--bs-gutter-y:3rem}}.table{--bs-table-color-type:initial;--bs-table-bg-type:initial;--bs-table-color-state:initial;--bs-table-bg-state:initial;--bs-table-color:var(--bs-emphasis-color);--bs-table-bg:var(--bs-body-bg);--bs-table-border-color:var(--bs-border-color);--bs-table-accent-bg:transparent;--bs-table-striped-color:var(--bs-emphasis-color);--bs-table-striped-bg:rgba(var(--bs-emphasis-color-rgb), 0.05);--bs-table-active-color:var(--bs-emphasis-color);--bs-table-active-bg:rgba(var(--bs-emphasis-color-rgb), 0.1);--bs-table-hover-color:var(--bs-emphasis-color);--bs-table-hover-bg:rgba(var(--bs-emphasis-color-rgb), 0.075);width:100%;margin-bottom:1rem;vertical-align:top;border-color:var(--bs-table-border-color)}.table>:not(caption)>*>*{padding:.5rem .5rem;color:var(--bs-table-color-state,var(--bs-table-color-type,var(--bs-table-color)));background-color:var(--bs-table-bg);border-bottom-width:var(--bs-border-width);box-shadow:inset 0 0 0 9999px var(--bs-table-bg-state,var(--bs-table-bg-type,var(--bs-table-accent-bg)))}.table>tbody{vertical-align:inherit}.table>thead{vertical-align:bottom}.table-group-divider{border-top:calc(var(--bs-border-width) * 2) solid currentcolor}.caption-top{caption-side:top}.table-sm>:not(caption)>*>*{padding:.25rem .25rem}.table-bordered>:not(caption)>*{border-width:var(--bs-border-width) 0}.table-bordered>:not(caption)>*>*{border-width:0 var(--bs-border-width)}.table-borderless>:not(caption)>*>*{border-bottom-width:0}.table-borderless>:not(:first-child){border-top-width:0}.table-striped>tbody>tr:nth-of-type(odd)>*{--bs-table-color-type:var(--bs-table-striped-color);--bs-table-bg-type:var(--bs-table-striped-bg)}.table-striped-columns>:not(caption)>tr>:nth-child(2n){--bs-table-color-type:var(--bs-table-striped-color);--bs-table-bg-type:var(--bs-table-striped-bg)}.table-active{--bs-table-color-state:var(--bs-table-active-color);--bs-table-bg-state:var(--bs-table-active-bg)}.table-hover>tbody>tr:hover>*{--bs-table-color-state:var(--bs-table-hover-color);--bs-table-bg-state:var(--bs-table-hover-bg)}.table-primary{--bs-table-color:#000;--bs-table-bg:#cfe2ff;--bs-table-border-color:#a6b5cc;--bs-table-striped-bg:#c5d7f2;--bs-table-striped-color:#000;--bs-table-active-bg:#bacbe6;--bs-table-active-color:#000;--bs-table-hover-bg:#bfd1ec;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-secondary{--bs-table-color:#000;--bs-table-bg:#e2e3e5;--bs-table-border-color:#b5b6b7;--bs-table-striped-bg:#d7d8da;--bs-table-striped-color:#000;--bs-table-active-bg:#cbccce;--bs-table-active-color:#000;--bs-table-hover-bg:#d1d2d4;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-success{--bs-table-color:#000;--bs-table-bg:#d1e7dd;--bs-table-border-color:#a7b9b1;--bs-table-striped-bg:#c7dbd2;--bs-table-striped-color:#000;--bs-table-active-bg:#bcd0c7;--bs-table-active-color:#000;--bs-table-hover-bg:#c1d6cc;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-info{--bs-table-color:#000;--bs-table-bg:#cff4fc;--bs-table-border-color:#a6c3ca;--bs-table-striped-bg:#c5e8ef;--bs-table-striped-color:#000;--bs-table-active-bg:#badce3;--bs-table-active-color:#000;--bs-table-hover-bg:#bfe2e9;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-warning{--bs-table-color:#000;--bs-table-bg:#fff3cd;--bs-table-border-color:#ccc2a4;--bs-table-striped-bg:#f2e7c3;--bs-table-striped-color:#000;--bs-table-active-bg:#e6dbb9;--bs-table-active-color:#000;--bs-table-hover-bg:#ece1be;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-danger{--bs-table-color:#000;--bs-table-bg:#f8d7da;--bs-table-border-color:#c6acae;--bs-table-striped-bg:#eccccf;--bs-table-striped-color:#000;--bs-table-active-bg:#dfc2c4;--bs-table-active-color:#000;--bs-table-hover-bg:#e5c7ca;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-light{--bs-table-color:#000;--bs-table-bg:#f8f9fa;--bs-table-border-color:#c6c7c8;--bs-table-striped-bg:#ecedee;--bs-table-striped-color:#000;--bs-table-active-bg:#dfe0e1;--bs-table-active-color:#000;--bs-table-hover-bg:#e5e6e7;--bs-table-hover-color:#000;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-dark{--bs-table-color:#fff;--bs-table-bg:#212529;--bs-table-border-color:#4d5154;--bs-table-striped-bg:#2c3034;--bs-table-striped-color:#fff;--bs-table-active-bg:#373b3e;--bs-table-active-color:#fff;--bs-table-hover-bg:#323539;--bs-table-hover-color:#fff;color:var(--bs-table-color);border-color:var(--bs-table-border-color)}.table-responsive{overflow-x:auto;-webkit-overflow-scrolling:touch}@media (max-width:575.98px){.table-responsive-sm{overflow-x:auto;-webkit-overflow-scrolling:touch}}@media (max-width:767.98px){.table-responsive-md{overflow-x:auto;-webkit-overflow-scrolling:touch}}@media (max-width:991.98px){.table-responsive-lg{overflow-x:auto;-webkit-overflow-scrolling:touch}}@media (max-width:1199.98px){.table-responsive-xl{overflow-x:auto;-webkit-overflow-scrolling:touch}}@media (max-width:1399.98px){.table-responsive-xxl{overflow-x:auto;-webkit-overflow-scrolling:touch}}.form-label{margin-bottom:.5rem}.col-form-label{padding-top:calc(.375rem + var(--bs-border-width));padding-bottom:calc(.375rem + var(--bs-border-width));margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + var(--bs-border-width));padding-bottom:calc(.5rem + var(--bs-border-width));font-size:1.25rem}.col-form-label-sm{padding-top:calc(.25rem + var(--bs-border-width));padding-bottom:calc(.25rem + var(--bs-border-width));font-size:.875rem}.form-text{margin-top:.25rem;font-size:.875em;color:var(--bs-secondary-color)}.form-control{display:block;width:100%;padding:.375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:var(--bs-body-color);-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:var(--bs-body-bg);background-clip:padding-box;border:var(--bs-border-width) solid var(--bs-border-color);border-radius:var(--bs-border-radius);transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control[type=file]{overflow:hidden}.form-control[type=file]:not(:disabled):not([readonly]){cursor:pointer}.form-control:focus{color:var(--bs-body-color);background-color:var(--bs-body-bg);border-color:#86b7fe;outline:0;box-shadow:0 0 0 .25rem rgba(13,110,253,.25)}.form-control::-webkit-date-and-time-value{min-width:85px;height:1.5em;margin:0}.form-control::-webkit-datetime-edit{display:block;padding:0}.form-control::-moz-placeholder{color:var(--bs-secondary-color);opacity:1}.form-control::placeholder{color:var(--bs-secondary-color);opacity:1}.form-control:disabled{background-color:var(--bs-secondary-bg);opacity:1}.form-control::-webkit-file-upload-button{padding:.375rem .75rem;margin:-.375rem -.75rem;-webkit-margin-end:.75rem;margin-inline-end:.75rem;color:var(--bs-body-color);background-color:var(--bs-tertiary-bg);pointer-events:none;border-color:inherit;border-style:solid;border-width:0;border-inline-end-width:var(--bs-border-width);border-radius:0;-webkit-transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}.form-control::file-selector-button{padding:.375rem .75rem;margin:-.375rem -.75rem;-webkit-margin-end:.75rem;margin-inline-end:.75rem;color:var(--bs-body-color);background-color:var(--bs-tertiary-bg);pointer-events:none;border-color:inherit;border-style:solid;border-width:0;border-inline-end-width:var(--bs-border-width);border-radius:0;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-control::-webkit-file-upload-button{-webkit-transition:none;transition:none}.form-control::file-selector-button{transition:none}}.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button{background-color:var(--bs-secondary-bg)}.form-control:hover:not(:disabled):not([readonly])::file-selector-button{background-color:var(--bs-secondary-bg)}.form-control-plaintext{display:block;width:100%;padding:.375rem 0;margin-bottom:0;line-height:1.5;color:var(--bs-body-color);background-color:transparent;border:solid transparent;border-width:var(--bs-border-width) 0}.form-control-plaintext:focus{outline:0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{min-height:calc(1.5em + .5rem + calc(var(--bs-border-width) * 2));padding:.25rem .5rem;font-size:.875rem;border-radius:var(--bs-border-radius-sm)}.form-control-sm::-webkit-file-upload-button{padding:.25rem .5rem;margin:-.25rem -.5rem;-webkit-margin-end:.5rem;margin-inline-end:.5rem}.form-control-sm::file-selector-button{padding:.25rem .5rem;margin:-.25rem -.5rem;-webkit-margin-end:.5rem;margin-inline-end:.5rem}.form-control-lg{min-height:calc(1.5em + 1rem + calc(var(--bs-border-width) * 2));padding:.5rem 1rem;font-size:1.25rem;border-radius:var(--bs-border-radius-lg)}.form-control-lg::-webkit-file-upload-button{padding:.5rem 1rem;margin:-.5rem -1rem;-webkit-margin-end:1rem;margin-inline-end:1rem}.form-control-lg::file-selector-button{padding:.5rem 1rem;margin:-.5rem -1rem;-webkit-margin-end:1rem;margin-inline-end:1rem}textarea.form-control{min-height:calc(1.5em + .75rem + calc(var(--bs-border-width) * 2))}textarea.form-control-sm{min-height:calc(1.5em + .5rem + calc(var(--bs-border-width) * 2))}textarea.form-control-lg{min-height:calc(1.5em + 1rem + calc(var(--bs-border-width) * 2))}.form-control-color{width:3rem;height:calc(1.5em + .75rem + calc(var(--bs-border-width) * 2));padding:.375rem}.form-control-color:not(:disabled):not([readonly]){cursor:pointer}.form-control-color::-moz-color-swatch{border:0!important;border-radius:var(--bs-border-radius)}.form-control-color::-webkit-color-swatch{border:0!important;border-radius:var(--bs-border-radius)}.form-control-color.form-control-sm{height:calc(1.5em + .5rem + calc(var(--bs-border-width) * 2))}.form-control-color.form-control-lg{height:calc(1.5em + 1rem + calc(var(--bs-border-width) * 2))}.form-select{--bs-form-select-bg-img:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e");display:block;width:100%;padding:.375rem 2.25rem .375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:var(--bs-body-color);-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:var(--bs-body-bg);background-image:var(--bs-form-select-bg-img),var(--bs-form-select-bg-icon,none);background-repeat:no-repeat;background-position:right .75rem center;background-size:16px 12px;border:var(--bs-border-width) solid var(--bs-border-color);border-radius:var(--bs-border-radius);transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-select{transition:none}}.form-select:focus{border-color:#86b7fe;outline:0;box-shadow:0 0 0 .25rem rgba(13,110,253,.25)}.form-select[multiple],.form-select[size]:not([size="1"]){padding-right:.75rem;background-image:none}.form-select:disabled{background-color:var(--bs-secondary-bg)}.form-select:-moz-focusring{color:transparent;text-shadow:0 0 0 var(--bs-body-color)}.form-select-sm{padding-top:.25rem;padding-bottom:.25rem;padding-left:.5rem;font-size:.875rem;border-radius:var(--bs-border-radius-sm)}.form-select-lg{padding-top:.5rem;padding-bottom:.5rem;padding-left:1rem;font-size:1.25rem;border-radius:var(--bs-border-radius-lg)}[data-bs-theme=dark] .form-select{--bs-form-select-bg-img:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23dee2e6' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e")}.form-check{display:block;min-height:1.5rem;padding-left:1.5em;margin-bottom:.125rem}.form-check .form-check-input{float:left;margin-left:-1.5em}.form-check-reverse{padding-right:1.5em;padding-left:0;text-align:right}.form-check-reverse .form-check-input{float:right;margin-right:-1.5em;margin-left:0}.form-check-input{--bs-form-check-bg:var(--bs-body-bg);flex-shrink:0;width:1em;height:1em;margin-top:.25em;vertical-align:top;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:var(--bs-form-check-bg);background-image:var(--bs-form-check-bg-image);background-repeat:no-repeat;background-position:center;background-size:contain;border:var(--bs-border-width) solid var(--bs-border-color);-webkit-print-color-adjust:exact;color-adjust:exact;print-color-adjust:exact}.form-check-input[type=checkbox]{border-radius:.25em}.form-check-input[type=radio]{border-radius:50%}.form-check-input:active{filter:brightness(90%)}.form-check-input:focus{border-color:#86b7fe;outline:0;box-shadow:0 0 0 .25rem rgba(13,110,253,.25)}.form-check-input:checked{background-color:#0d6efd;border-color:#0d6efd}.form-check-input:checked[type=checkbox]{--bs-form-check-bg-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e")}.form-check-input:checked[type=radio]{--bs-form-check-bg-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='%23fff'/%3e%3c/svg%3e")}.form-check-input[type=checkbox]:indeterminate{background-color:#0d6efd;border-color:#0d6efd;--bs-form-check-bg-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/%3e%3c/svg%3e")}.form-check-input:disabled{pointer-events:none;filter:none;opacity:.5}.form-check-input:disabled~.form-check-label,.form-check-input[disabled]~.form-check-label{cursor:default;opacity:.5}.form-switch{padding-left:2.5em}.form-switch .form-check-input{--bs-form-switch-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='rgba%280, 0, 0, 0.25%29'/%3e%3c/svg%3e");width:2em;margin-left:-2.5em;background-image:var(--bs-form-switch-bg);background-position:left center;border-radius:2em;transition:background-position .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-switch .form-check-input{transition:none}}.form-switch .form-check-input:focus{--bs-form-switch-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%2386b7fe'/%3e%3c/svg%3e")}.form-switch .form-check-input:checked{background-position:right center;--bs-form-switch-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e")}.form-switch.form-check-reverse{padding-right:2.5em;padding-left:0}.form-switch.form-check-reverse .form-check-input{margin-right:-2.5em;margin-left:0}.form-check-inline{display:inline-block;margin-right:1rem}.btn-check{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.btn-check:disabled+.btn,.btn-check[disabled]+.btn{pointer-events:none;filter:none;opacity:.65}[data-bs-theme=dark] .form-switch .form-check-input:not(:checked):not(:focus){--bs-form-switch-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='rgba%28255, 255, 255, 0.25%29'/%3e%3c/svg%3e")}.form-range{width:100%;height:1.5rem;padding:0;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:transparent}.form-range:focus{outline:0}.form-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .25rem rgba(13,110,253,.25)}.form-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .25rem rgba(13,110,253,.25)}.form-range::-moz-focus-outer{border:0}.form-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;-webkit-appearance:none;appearance:none;background-color:#0d6efd;border:0;border-radius:1rem;-webkit-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}}.form-range::-webkit-slider-thumb:active{background-color:#b6d4fe}.form-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:var(--bs-secondary-bg);border-color:transparent;border-radius:1rem}.form-range::-moz-range-thumb{width:1rem;height:1rem;-moz-appearance:none;appearance:none;background-color:#0d6efd;border:0;border-radius:1rem;-moz-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-range::-moz-range-thumb{-moz-transition:none;transition:none}}.form-range::-moz-range-thumb:active{background-color:#b6d4fe}.form-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:var(--bs-secondary-bg);border-color:transparent;border-radius:1rem}.form-range:disabled{pointer-events:none}.form-range:disabled::-webkit-slider-thumb{background-color:var(--bs-secondary-color)}.form-range:disabled::-moz-range-thumb{background-color:var(--bs-secondary-color)}.form-floating{position:relative}.form-floating>.form-control,.form-floating>.form-control-plaintext,.form-floating>.form-select{height:calc(3.5rem + calc(var(--bs-border-width) * 2));min-height:calc(3.5rem + calc(var(--bs-border-width) * 2));line-height:1.25}.form-floating>label{position:absolute;top:0;left:0;z-index:2;height:100%;padding:1rem .75rem;overflow:hidden;text-align:start;text-overflow:ellipsis;white-space:nowrap;pointer-events:none;border:var(--bs-border-width) solid transparent;transform-origin:0 0;transition:opacity .1s ease-in-out,transform .1s ease-in-out}@media (prefers-reduced-motion:reduce){.form-floating>label{transition:none}}.form-floating>.form-control,.form-floating>.form-control-plaintext{padding:1rem .75rem}.form-floating>.form-control-plaintext::-moz-placeholder,.form-floating>.form-control::-moz-placeholder{color:transparent}.form-floating>.form-control-plaintext::placeholder,.form-floating>.form-control::placeholder{color:transparent}.form-floating>.form-control-plaintext:not(:-moz-placeholder-shown),.form-floating>.form-control:not(:-moz-placeholder-shown){padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-control-plaintext:focus,.form-floating>.form-control-plaintext:not(:placeholder-shown),.form-floating>.form-control:focus,.form-floating>.form-control:not(:placeholder-shown){padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-control-plaintext:-webkit-autofill,.form-floating>.form-control:-webkit-autofill{padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-select{padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-control:not(:-moz-placeholder-shown)~label{color:rgba(var(--bs-body-color-rgb),.65);transform:scale(.85) translateY(-.5rem) translateX(.15rem)}.form-floating>.form-control-plaintext~label,.form-floating>.form-control:focus~label,.form-floating>.form-control:not(:placeholder-shown)~label,.form-floating>.form-select~label{color:rgba(var(--bs-body-color-rgb),.65);transform:scale(.85) translateY(-.5rem) translateX(.15rem)}.form-floating>.form-control:not(:-moz-placeholder-shown)~label::after{position:absolute;inset:1rem 0.375rem;z-index:-1;height:1.5em;content:"";background-color:var(--bs-body-bg);border-radius:var(--bs-border-radius)}.form-floating>.form-control-plaintext~label::after,.form-floating>.form-control:focus~label::after,.form-floating>.form-control:not(:placeholder-shown)~label::after,.form-floating>.form-select~label::after{position:absolute;inset:1rem 0.375rem;z-index:-1;height:1.5em;content:"";background-color:var(--bs-body-bg);border-radius:var(--bs-border-radius)}.form-floating>.form-control:-webkit-autofill~label{color:rgba(var(--bs-body-color-rgb),.65);transform:scale(.85) translateY(-.5rem) translateX(.15rem)}.form-floating>.form-control-plaintext~label{border-width:var(--bs-border-width) 0}.form-floating>.form-control:disabled~label,.form-floating>:disabled~label{color:#6c757d}.form-floating>.form-control:disabled~label::after,.form-floating>:disabled~label::after{background-color:var(--bs-secondary-bg)}.input-group{position:relative;display:flex;flex-wrap:wrap;align-items:stretch;width:100%}.input-group>.form-control,.input-group>.form-floating,.input-group>.form-select{position:relative;flex:1 1 auto;width:1%;min-width:0}.input-group>.form-control:focus,.input-group>.form-floating:focus-within,.input-group>.form-select:focus{z-index:5}.input-group .btn{position:relative;z-index:2}.input-group .btn:focus{z-index:5}.input-group-text{display:flex;align-items:center;padding:.375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:var(--bs-body-color);text-align:center;white-space:nowrap;background-color:var(--bs-tertiary-bg);border:var(--bs-border-width) solid var(--bs-border-color);border-radius:var(--bs-border-radius)}.input-group-lg>.btn,.input-group-lg>.form-control,.input-group-lg>.form-select,.input-group-lg>.input-group-text{padding:.5rem 1rem;font-size:1.25rem;border-radius:var(--bs-border-radius-lg)}.input-group-sm>.btn,.input-group-sm>.form-control,.input-group-sm>.form-select,.input-group-sm>.input-group-text{padding:.25rem .5rem;font-size:.875rem;border-radius:var(--bs-border-radius-sm)}.input-group-lg>.form-select,.input-group-sm>.form-select{padding-right:3rem}.input-group:not(.has-validation)>.dropdown-toggle:nth-last-child(n+3),.input-group:not(.has-validation)>.form-floating:not(:last-child)>.form-control,.input-group:not(.has-validation)>.form-floating:not(:last-child)>.form-select,.input-group:not(.has-validation)>:not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating){border-top-right-radius:0;border-bottom-right-radius:0}.input-group.has-validation>.dropdown-toggle:nth-last-child(n+4),.input-group.has-validation>.form-floating:nth-last-child(n+3)>.form-control,.input-group.has-validation>.form-floating:nth-last-child(n+3)>.form-select,.input-group.has-validation>:nth-last-child(n+3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>:not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback){margin-left:calc(var(--bs-border-width) * -1);border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.form-floating:not(:first-child)>.form-control,.input-group>.form-floating:not(:first-child)>.form-select{border-top-left-radius:0;border-bottom-left-radius:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:.875em;color:var(--bs-form-valid-color)}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;color:#fff;background-color:var(--bs-success);border-radius:var(--bs-border-radius)}.is-valid~.valid-feedback,.is-valid~.valid-tooltip,.was-validated :valid~.valid-feedback,.was-validated :valid~.valid-tooltip{display:block}.form-control.is-valid,.was-validated .form-control:valid{border-color:var(--bs-form-valid-border-color);padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-valid:focus,.was-validated .form-control:valid:focus{border-color:var(--bs-form-valid-border-color);box-shadow:0 0 0 .25rem rgba(var(--bs-success-rgb),.25)}.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.form-select.is-valid,.was-validated .form-select:valid{border-color:var(--bs-form-valid-border-color)}.form-select.is-valid:not([multiple]):not([size]),.form-select.is-valid:not([multiple])[size="1"],.was-validated .form-select:valid:not([multiple]):not([size]),.was-validated .form-select:valid:not([multiple])[size="1"]{--bs-form-select-bg-icon:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");padding-right:4.125rem;background-position:right .75rem center,center right 2.25rem;background-size:16px 12px,calc(.75em + .375rem) calc(.75em + .375rem)}.form-select.is-valid:focus,.was-validated .form-select:valid:focus{border-color:var(--bs-form-valid-border-color);box-shadow:0 0 0 .25rem rgba(var(--bs-success-rgb),.25)}.form-control-color.is-valid,.was-validated .form-control-color:valid{width:calc(3rem + calc(1.5em + .75rem))}.form-check-input.is-valid,.was-validated .form-check-input:valid{border-color:var(--bs-form-valid-border-color)}.form-check-input.is-valid:checked,.was-validated .form-check-input:valid:checked{background-color:var(--bs-form-valid-color)}.form-check-input.is-valid:focus,.was-validated .form-check-input:valid:focus{box-shadow:0 0 0 .25rem rgba(var(--bs-success-rgb),.25)}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:var(--bs-form-valid-color)}.form-check-inline .form-check-input~.valid-feedback{margin-left:.5em}.input-group>.form-control:not(:focus).is-valid,.input-group>.form-floating:not(:focus-within).is-valid,.input-group>.form-select:not(:focus).is-valid,.was-validated .input-group>.form-control:not(:focus):valid,.was-validated .input-group>.form-floating:not(:focus-within):valid,.was-validated .input-group>.form-select:not(:focus):valid{z-index:3}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:.875em;color:var(--bs-form-invalid-color)}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;color:#fff;background-color:var(--bs-danger);border-radius:var(--bs-border-radius)}.is-invalid~.invalid-feedback,.is-invalid~.invalid-tooltip,.was-validated :invalid~.invalid-feedback,.was-validated :invalid~.invalid-tooltip{display:block}.form-control.is-invalid,.was-validated .form-control:invalid{border-color:var(--bs-form-invalid-border-color);padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23dc3545'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-invalid:focus,.was-validated .form-control:invalid:focus{border-color:var(--bs-form-invalid-border-color);box-shadow:0 0 0 .25rem rgba(var(--bs-danger-rgb),.25)}.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.form-select.is-invalid,.was-validated .form-select:invalid{border-color:var(--bs-form-invalid-border-color)}.form-select.is-invalid:not([multiple]):not([size]),.form-select.is-invalid:not([multiple])[size="1"],.was-validated .form-select:invalid:not([multiple]):not([size]),.was-validated .form-select:invalid:not([multiple])[size="1"]{--bs-form-select-bg-icon:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23dc3545'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");padding-right:4.125rem;background-position:right .75rem center,center right 2.25rem;background-size:16px 12px,calc(.75em + .375rem) calc(.75em + .375rem)}.form-select.is-invalid:focus,.was-validated .form-select:invalid:focus{border-color:var(--bs-form-invalid-border-color);box-shadow:0 0 0 .25rem rgba(var(--bs-danger-rgb),.25)}.form-control-color.is-invalid,.was-validated .form-control-color:invalid{width:calc(3rem + calc(1.5em + .75rem))}.form-check-input.is-invalid,.was-validated .form-check-input:invalid{border-color:var(--bs-form-invalid-border-color)}.form-check-input.is-invalid:checked,.was-validated .form-check-input:invalid:checked{background-color:var(--bs-form-invalid-color)}.form-check-input.is-invalid:focus,.was-validated .form-check-input:invalid:focus{box-shadow:0 0 0 .25rem rgba(var(--bs-danger-rgb),.25)}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:var(--bs-form-invalid-color)}.form-check-inline .form-check-input~.invalid-feedback{margin-left:.5em}.input-group>.form-control:not(:focus).is-invalid,.input-group>.form-floating:not(:focus-within).is-invalid,.input-group>.form-select:not(:focus).is-invalid,.was-validated .input-group>.form-control:not(:focus):invalid,.was-validated .input-group>.form-floating:not(:focus-within):invalid,.was-validated .input-group>.form-select:not(:focus):invalid{z-index:4}.btn{--bs-btn-padding-x:0.75rem;--bs-btn-padding-y:0.375rem;--bs-btn-font-family: ;--bs-btn-font-size:1rem;--bs-btn-font-weight:400;--bs-btn-line-height:1.5;--bs-btn-color:var(--bs-body-color);--bs-btn-bg:transparent;--bs-btn-border-width:var(--bs-border-width);--bs-btn-border-color:transparent;--bs-btn-border-radius:var(--bs-border-radius);--bs-btn-hover-border-color:transparent;--bs-btn-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.15),0 1px 1px rgba(0, 0, 0, 0.075);--bs-btn-disabled-opacity:0.65;--bs-btn-focus-box-shadow:0 0 0 0.25rem rgba(var(--bs-btn-focus-shadow-rgb), .5);display:inline-block;padding:var(--bs-btn-padding-y) var(--bs-btn-padding-x);font-family:var(--bs-btn-font-family);font-size:var(--bs-btn-font-size);font-weight:var(--bs-btn-font-weight);line-height:var(--bs-btn-line-height);color:var(--bs-btn-color);text-align:center;text-decoration:none;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;user-select:none;border:var(--bs-btn-border-width) solid var(--bs-btn-border-color);border-radius:var(--bs-btn-border-radius);background-color:var(--bs-btn-bg);transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:var(--bs-btn-hover-color);background-color:var(--bs-btn-hover-bg);border-color:var(--bs-btn-hover-border-color)}.btn-check+.btn:hover{color:var(--bs-btn-color);background-color:var(--bs-btn-bg);border-color:var(--bs-btn-border-color)}.btn:focus-visible{color:var(--bs-btn-hover-color);background-color:var(--bs-btn-hover-bg);border-color:var(--bs-btn-hover-border-color);outline:0;box-shadow:var(--bs-btn-focus-box-shadow)}.btn-check:focus-visible+.btn{border-color:var(--bs-btn-hover-border-color);outline:0;box-shadow:var(--bs-btn-focus-box-shadow)}.btn-check:checked+.btn,.btn.active,.btn.show,.btn:first-child:active,:not(.btn-check)+.btn:active{color:var(--bs-btn-active-color);background-color:var(--bs-btn-active-bg);border-color:var(--bs-btn-active-border-color)}.btn-check:checked+.btn:focus-visible,.btn.active:focus-visible,.btn.show:focus-visible,.btn:first-child:active:focus-visible,:not(.btn-check)+.btn:active:focus-visible{box-shadow:var(--bs-btn-focus-box-shadow)}.btn.disabled,.btn:disabled,fieldset:disabled .btn{color:var(--bs-btn-disabled-color);pointer-events:none;background-color:var(--bs-btn-disabled-bg);border-color:var(--bs-btn-disabled-border-color);opacity:var(--bs-btn-disabled-opacity)}.btn-primary{--bs-btn-color:#fff;--bs-btn-bg:#0d6efd;--bs-btn-border-color:#0d6efd;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#0b5ed7;--bs-btn-hover-border-color:#0a58ca;--bs-btn-focus-shadow-rgb:49,132,253;--bs-btn-active-color:#fff;--bs-btn-active-bg:#0a58ca;--bs-btn-active-border-color:#0a53be;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#fff;--bs-btn-disabled-bg:#0d6efd;--bs-btn-disabled-border-color:#0d6efd}.btn-secondary{--bs-btn-color:#fff;--bs-btn-bg:#6c757d;--bs-btn-border-color:#6c757d;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#5c636a;--bs-btn-hover-border-color:#565e64;--bs-btn-focus-shadow-rgb:130,138,145;--bs-btn-active-color:#fff;--bs-btn-active-bg:#565e64;--bs-btn-active-border-color:#51585e;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#fff;--bs-btn-disabled-bg:#6c757d;--bs-btn-disabled-border-color:#6c757d}.btn-success{--bs-btn-color:#fff;--bs-btn-bg:#198754;--bs-btn-border-color:#198754;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#157347;--bs-btn-hover-border-color:#146c43;--bs-btn-focus-shadow-rgb:60,153,110;--bs-btn-active-color:#fff;--bs-btn-active-bg:#146c43;--bs-btn-active-border-color:#13653f;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#fff;--bs-btn-disabled-bg:#198754;--bs-btn-disabled-border-color:#198754}.btn-info{--bs-btn-color:#000;--bs-btn-bg:#0dcaf0;--bs-btn-border-color:#0dcaf0;--bs-btn-hover-color:#000;--bs-btn-hover-bg:#31d2f2;--bs-btn-hover-border-color:#25cff2;--bs-btn-focus-shadow-rgb:11,172,204;--bs-btn-active-color:#000;--bs-btn-active-bg:#3dd5f3;--bs-btn-active-border-color:#25cff2;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#000;--bs-btn-disabled-bg:#0dcaf0;--bs-btn-disabled-border-color:#0dcaf0}.btn-warning{--bs-btn-color:#000;--bs-btn-bg:#ffc107;--bs-btn-border-color:#ffc107;--bs-btn-hover-color:#000;--bs-btn-hover-bg:#ffca2c;--bs-btn-hover-border-color:#ffc720;--bs-btn-focus-shadow-rgb:217,164,6;--bs-btn-active-color:#000;--bs-btn-active-bg:#ffcd39;--bs-btn-active-border-color:#ffc720;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#000;--bs-btn-disabled-bg:#ffc107;--bs-btn-disabled-border-color:#ffc107}.btn-danger{--bs-btn-color:#fff;--bs-btn-bg:#dc3545;--bs-btn-border-color:#dc3545;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#bb2d3b;--bs-btn-hover-border-color:#b02a37;--bs-btn-focus-shadow-rgb:225,83,97;--bs-btn-active-color:#fff;--bs-btn-active-bg:#b02a37;--bs-btn-active-border-color:#a52834;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#fff;--bs-btn-disabled-bg:#dc3545;--bs-btn-disabled-border-color:#dc3545}.btn-light{--bs-btn-color:#000;--bs-btn-bg:#f8f9fa;--bs-btn-border-color:#f8f9fa;--bs-btn-hover-color:#000;--bs-btn-hover-bg:#d3d4d5;--bs-btn-hover-border-color:#c6c7c8;--bs-btn-focus-shadow-rgb:211,212,213;--bs-btn-active-color:#000;--bs-btn-active-bg:#c6c7c8;--bs-btn-active-border-color:#babbbc;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#000;--bs-btn-disabled-bg:#f8f9fa;--bs-btn-disabled-border-color:#f8f9fa}.btn-dark{--bs-btn-color:#fff;--bs-btn-bg:#212529;--bs-btn-border-color:#212529;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#424649;--bs-btn-hover-border-color:#373b3e;--bs-btn-focus-shadow-rgb:66,70,73;--bs-btn-active-color:#fff;--bs-btn-active-bg:#4d5154;--bs-btn-active-border-color:#373b3e;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#fff;--bs-btn-disabled-bg:#212529;--bs-btn-disabled-border-color:#212529}.btn-outline-primary{--bs-btn-color:#0d6efd;--bs-btn-border-color:#0d6efd;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#0d6efd;--bs-btn-hover-border-color:#0d6efd;--bs-btn-focus-shadow-rgb:13,110,253;--bs-btn-active-color:#fff;--bs-btn-active-bg:#0d6efd;--bs-btn-active-border-color:#0d6efd;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#0d6efd;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#0d6efd;--bs-gradient:none}.btn-outline-secondary{--bs-btn-color:#6c757d;--bs-btn-border-color:#6c757d;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#6c757d;--bs-btn-hover-border-color:#6c757d;--bs-btn-focus-shadow-rgb:108,117,125;--bs-btn-active-color:#fff;--bs-btn-active-bg:#6c757d;--bs-btn-active-border-color:#6c757d;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#6c757d;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#6c757d;--bs-gradient:none}.btn-outline-success{--bs-btn-color:#198754;--bs-btn-border-color:#198754;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#198754;--bs-btn-hover-border-color:#198754;--bs-btn-focus-shadow-rgb:25,135,84;--bs-btn-active-color:#fff;--bs-btn-active-bg:#198754;--bs-btn-active-border-color:#198754;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#198754;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#198754;--bs-gradient:none}.btn-outline-info{--bs-btn-color:#0dcaf0;--bs-btn-border-color:#0dcaf0;--bs-btn-hover-color:#000;--bs-btn-hover-bg:#0dcaf0;--bs-btn-hover-border-color:#0dcaf0;--bs-btn-focus-shadow-rgb:13,202,240;--bs-btn-active-color:#000;--bs-btn-active-bg:#0dcaf0;--bs-btn-active-border-color:#0dcaf0;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#0dcaf0;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#0dcaf0;--bs-gradient:none}.btn-outline-warning{--bs-btn-color:#ffc107;--bs-btn-border-color:#ffc107;--bs-btn-hover-color:#000;--bs-btn-hover-bg:#ffc107;--bs-btn-hover-border-color:#ffc107;--bs-btn-focus-shadow-rgb:255,193,7;--bs-btn-active-color:#000;--bs-btn-active-bg:#ffc107;--bs-btn-active-border-color:#ffc107;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#ffc107;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#ffc107;--bs-gradient:none}.btn-outline-danger{--bs-btn-color:#dc3545;--bs-btn-border-color:#dc3545;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#dc3545;--bs-btn-hover-border-color:#dc3545;--bs-btn-focus-shadow-rgb:220,53,69;--bs-btn-active-color:#fff;--bs-btn-active-bg:#dc3545;--bs-btn-active-border-color:#dc3545;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#dc3545;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#dc3545;--bs-gradient:none}.btn-outline-light{--bs-btn-color:#f8f9fa;--bs-btn-border-color:#f8f9fa;--bs-btn-hover-color:#000;--bs-btn-hover-bg:#f8f9fa;--bs-btn-hover-border-color:#f8f9fa;--bs-btn-focus-shadow-rgb:248,249,250;--bs-btn-active-color:#000;--bs-btn-active-bg:#f8f9fa;--bs-btn-active-border-color:#f8f9fa;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#f8f9fa;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#f8f9fa;--bs-gradient:none}.btn-outline-dark{--bs-btn-color:#212529;--bs-btn-border-color:#212529;--bs-btn-hover-color:#fff;--bs-btn-hover-bg:#212529;--bs-btn-hover-border-color:#212529;--bs-btn-focus-shadow-rgb:33,37,41;--bs-btn-active-color:#fff;--bs-btn-active-bg:#212529;--bs-btn-active-border-color:#212529;--bs-btn-active-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);--bs-btn-disabled-color:#212529;--bs-btn-disabled-bg:transparent;--bs-btn-disabled-border-color:#212529;--bs-gradient:none}.btn-link{--bs-btn-font-weight:400;--bs-btn-color:var(--bs-link-color);--bs-btn-bg:transparent;--bs-btn-border-color:transparent;--bs-btn-hover-color:var(--bs-link-hover-color);--bs-btn-hover-border-color:transparent;--bs-btn-active-color:var(--bs-link-hover-color);--bs-btn-active-border-color:transparent;--bs-btn-disabled-color:#6c757d;--bs-btn-disabled-border-color:transparent;--bs-btn-box-shadow:0 0 0 #000;--bs-btn-focus-shadow-rgb:49,132,253;text-decoration:underline}.btn-link:focus-visible{color:var(--bs-btn-color)}.btn-link:hover{color:var(--bs-btn-hover-color)}.btn-group-lg>.btn,.btn-lg{--bs-btn-padding-y:0.5rem;--bs-btn-padding-x:1rem;--bs-btn-font-size:1.25rem;--bs-btn-border-radius:var(--bs-border-radius-lg)}.btn-group-sm>.btn,.btn-sm{--bs-btn-padding-y:0.25rem;--bs-btn-padding-x:0.5rem;--bs-btn-font-size:0.875rem;--bs-btn-border-radius:var(--bs-border-radius-sm)}.fade{transition:opacity .15s linear}@media (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{height:0;overflow:hidden;transition:height .35s ease}@media (prefers-reduced-motion:reduce){.collapsing{transition:none}}.collapsing.collapse-horizontal{width:0;height:auto;transition:width .35s ease}@media (prefers-reduced-motion:reduce){.collapsing.collapse-horizontal{transition:none}}.dropdown,.dropdown-center,.dropend,.dropstart,.dropup,.dropup-center{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{--bs-dropdown-zindex:1000;--bs-dropdown-min-width:10rem;--bs-dropdown-padding-x:0;--bs-dropdown-padding-y:0.5rem;--bs-dropdown-spacer:0.125rem;--bs-dropdown-font-size:1rem;--bs-dropdown-color:var(--bs-body-color);--bs-dropdown-bg:var(--bs-body-bg);--bs-dropdown-border-color:var(--bs-border-color-translucent);--bs-dropdown-border-radius:var(--bs-border-radius);--bs-dropdown-border-width:var(--bs-border-width);--bs-dropdown-inner-border-radius:calc(var(--bs-border-radius) - var(--bs-border-width));--bs-dropdown-divider-bg:var(--bs-border-color-translucent);--bs-dropdown-divider-margin-y:0.5rem;--bs-dropdown-box-shadow:var(--bs-box-shadow);--bs-dropdown-link-color:var(--bs-body-color);--bs-dropdown-link-hover-color:var(--bs-body-color);--bs-dropdown-link-hover-bg:var(--bs-tertiary-bg);--bs-dropdown-link-active-color:#fff;--bs-dropdown-link-active-bg:#0d6efd;--bs-dropdown-link-disabled-color:var(--bs-tertiary-color);--bs-dropdown-item-padding-x:1rem;--bs-dropdown-item-padding-y:0.25rem;--bs-dropdown-header-color:#6c757d;--bs-dropdown-header-padding-x:1rem;--bs-dropdown-header-padding-y:0.5rem;position:absolute;z-index:var(--bs-dropdown-zindex);display:none;min-width:var(--bs-dropdown-min-width);padding:var(--bs-dropdown-padding-y) var(--bs-dropdown-padding-x);margin:0;font-size:var(--bs-dropdown-font-size);color:var(--bs-dropdown-color);text-align:left;list-style:none;background-color:var(--bs-dropdown-bg);background-clip:padding-box;border:var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);border-radius:var(--bs-dropdown-border-radius)}.dropdown-menu[data-bs-popper]{top:100%;left:0;margin-top:var(--bs-dropdown-spacer)}.dropdown-menu-start{--bs-position:start}.dropdown-menu-start[data-bs-popper]{right:auto;left:0}.dropdown-menu-end{--bs-position:end}.dropdown-menu-end[data-bs-popper]{right:0;left:auto}@media (min-width:576px){.dropdown-menu-sm-start{--bs-position:start}.dropdown-menu-sm-start[data-bs-popper]{right:auto;left:0}.dropdown-menu-sm-end{--bs-position:end}.dropdown-menu-sm-end[data-bs-popper]{right:0;left:auto}}@media (min-width:768px){.dropdown-menu-md-start{--bs-position:start}.dropdown-menu-md-start[data-bs-popper]{right:auto;left:0}.dropdown-menu-md-end{--bs-position:end}.dropdown-menu-md-end[data-bs-popper]{right:0;left:auto}}@media (min-width:992px){.dropdown-menu-lg-start{--bs-position:start}.dropdown-menu-lg-start[data-bs-popper]{right:auto;left:0}.dropdown-menu-lg-end{--bs-position:end}.dropdown-menu-lg-end[data-bs-popper]{right:0;left:auto}}@media (min-width:1200px){.dropdown-menu-xl-start{--bs-position:start}.dropdown-menu-xl-start[data-bs-popper]{right:auto;left:0}.dropdown-menu-xl-end{--bs-position:end}.dropdown-menu-xl-end[data-bs-popper]{right:0;left:auto}}@media (min-width:1400px){.dropdown-menu-xxl-start{--bs-position:start}.dropdown-menu-xxl-start[data-bs-popper]{right:auto;left:0}.dropdown-menu-xxl-end{--bs-position:end}.dropdown-menu-xxl-end[data-bs-popper]{right:0;left:auto}}.dropup .dropdown-menu[data-bs-popper]{top:auto;bottom:100%;margin-top:0;margin-bottom:var(--bs-dropdown-spacer)}.dropup .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropend .dropdown-menu[data-bs-popper]{top:0;right:auto;left:100%;margin-top:0;margin-left:var(--bs-dropdown-spacer)}.dropend .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropend .dropdown-toggle:empty::after{margin-left:0}.dropend .dropdown-toggle::after{vertical-align:0}.dropstart .dropdown-menu[data-bs-popper]{top:0;right:100%;left:auto;margin-top:0;margin-right:var(--bs-dropdown-spacer)}.dropstart .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:""}.dropstart .dropdown-toggle::after{display:none}.dropstart .dropdown-toggle::before{display:inline-block;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropstart .dropdown-toggle:empty::after{margin-left:0}.dropstart .dropdown-toggle::before{vertical-align:0}.dropdown-divider{height:0;margin:var(--bs-dropdown-divider-margin-y) 0;overflow:hidden;border-top:1px solid var(--bs-dropdown-divider-bg);opacity:1}.dropdown-item{display:block;width:100%;padding:var(--bs-dropdown-item-padding-y) var(--bs-dropdown-item-padding-x);clear:both;font-weight:400;color:var(--bs-dropdown-link-color);text-align:inherit;text-decoration:none;white-space:nowrap;background-color:transparent;border:0;border-radius:var(--bs-dropdown-item-border-radius,0)}.dropdown-item:focus,.dropdown-item:hover{color:var(--bs-dropdown-link-hover-color);background-color:var(--bs-dropdown-link-hover-bg)}.dropdown-item.active,.dropdown-item:active{color:var(--bs-dropdown-link-active-color);text-decoration:none;background-color:var(--bs-dropdown-link-active-bg)}.dropdown-item.disabled,.dropdown-item:disabled{color:var(--bs-dropdown-link-disabled-color);pointer-events:none;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x);margin-bottom:0;font-size:.875rem;color:var(--bs-dropdown-header-color);white-space:nowrap}.dropdown-item-text{display:block;padding:var(--bs-dropdown-item-padding-y) var(--bs-dropdown-item-padding-x);color:var(--bs-dropdown-link-color)}.dropdown-menu-dark{--bs-dropdown-color:#dee2e6;--bs-dropdown-bg:#343a40;--bs-dropdown-border-color:var(--bs-border-color-translucent);--bs-dropdown-box-shadow: ;--bs-dropdown-link-color:#dee2e6;--bs-dropdown-link-hover-color:#fff;--bs-dropdown-divider-bg:var(--bs-border-color-translucent);--bs-dropdown-link-hover-bg:rgba(255, 255, 255, 0.15);--bs-dropdown-link-active-color:#fff;--bs-dropdown-link-active-bg:#0d6efd;--bs-dropdown-link-disabled-color:#adb5bd;--bs-dropdown-header-color:#adb5bd}.btn-group,.btn-group-vertical{position:relative;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;flex:1 1 auto}.btn-group-vertical>.btn-check:checked+.btn,.btn-group-vertical>.btn-check:focus+.btn,.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn-check:checked+.btn,.btn-group>.btn-check:focus+.btn,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:1}.btn-toolbar{display:flex;flex-wrap:wrap;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group{border-radius:var(--bs-border-radius)}.btn-group>.btn-group:not(:first-child),.btn-group>:not(.btn-check:first-child)+.btn{margin-left:calc(var(--bs-border-width) * -1)}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn.dropdown-toggle-split:first-child,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:nth-child(n+3),.btn-group>:not(.btn-check)+.btn{border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split::after,.dropend .dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after{margin-left:0}.dropstart .dropdown-toggle-split::before{margin-right:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{flex-direction:column;align-items:flex-start;justify-content:center}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}.btn-group-vertical>.btn-group:not(:first-child),.btn-group-vertical>.btn:not(:first-child){margin-top:calc(var(--bs-border-width) * -1)}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn~.btn{border-top-left-radius:0;border-top-right-radius:0}.nav{--bs-nav-link-padding-x:1rem;--bs-nav-link-padding-y:0.5rem;--bs-nav-link-font-weight: ;--bs-nav-link-color:var(--bs-link-color);--bs-nav-link-hover-color:var(--bs-link-hover-color);--bs-nav-link-disabled-color:var(--bs-secondary-color);display:flex;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:var(--bs-nav-link-padding-y) var(--bs-nav-link-padding-x);font-size:var(--bs-nav-link-font-size);font-weight:var(--bs-nav-link-font-weight);color:var(--bs-nav-link-color);text-decoration:none;background:0 0;border:0;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out}@media (prefers-reduced-motion:reduce){.nav-link{transition:none}}.nav-link:focus,.nav-link:hover{color:var(--bs-nav-link-hover-color)}.nav-link:focus-visible{outline:0;box-shadow:0 0 0 .25rem rgba(13,110,253,.25)}.nav-link.disabled,.nav-link:disabled{color:var(--bs-nav-link-disabled-color);pointer-events:none;cursor:default}.nav-tabs{--bs-nav-tabs-border-width:var(--bs-border-width);--bs-nav-tabs-border-color:var(--bs-border-color);--bs-nav-tabs-border-radius:var(--bs-border-radius);--bs-nav-tabs-link-hover-border-color:var(--bs-secondary-bg) var(--bs-secondary-bg) var(--bs-border-color);--bs-nav-tabs-link-active-color:var(--bs-emphasis-color);--bs-nav-tabs-link-active-bg:var(--bs-body-bg);--bs-nav-tabs-link-active-border-color:var(--bs-border-color) var(--bs-border-color) var(--bs-body-bg);border-bottom:var(--bs-nav-tabs-border-width) solid var(--bs-nav-tabs-border-color)}.nav-tabs .nav-link{margin-bottom:calc(-1 * var(--bs-nav-tabs-border-width));border:var(--bs-nav-tabs-border-width) solid transparent;border-top-left-radius:var(--bs-nav-tabs-border-radius);border-top-right-radius:var(--bs-nav-tabs-border-radius)}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{isolation:isolate;border-color:var(--bs-nav-tabs-link-hover-border-color)}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:var(--bs-nav-tabs-link-active-color);background-color:var(--bs-nav-tabs-link-active-bg);border-color:var(--bs-nav-tabs-link-active-border-color)}.nav-tabs .dropdown-menu{margin-top:calc(-1 * var(--bs-nav-tabs-border-width));border-top-left-radius:0;border-top-right-radius:0}.nav-pills{--bs-nav-pills-border-radius:var(--bs-border-radius);--bs-nav-pills-link-active-color:#fff;--bs-nav-pills-link-active-bg:#0d6efd}.nav-pills .nav-link{border-radius:var(--bs-nav-pills-border-radius)}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:var(--bs-nav-pills-link-active-color);background-color:var(--bs-nav-pills-link-active-bg)}.nav-underline{--bs-nav-underline-gap:1rem;--bs-nav-underline-border-width:0.125rem;--bs-nav-underline-link-active-color:var(--bs-emphasis-color);gap:var(--bs-nav-underline-gap)}.nav-underline .nav-link{padding-right:0;padding-left:0;border-bottom:var(--bs-nav-underline-border-width) solid transparent}.nav-underline .nav-link:focus,.nav-underline .nav-link:hover{border-bottom-color:currentcolor}.nav-underline .nav-link.active,.nav-underline .show>.nav-link{font-weight:700;color:var(--bs-nav-underline-link-active-color);border-bottom-color:currentcolor}.nav-fill .nav-item,.nav-fill>.nav-link{flex:1 1 auto;text-align:center}.nav-justified .nav-item,.nav-justified>.nav-link{flex-basis:0;flex-grow:1;text-align:center}.nav-fill .nav-item .nav-link,.nav-justified .nav-item .nav-link{width:100%}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{--bs-navbar-padding-x:0;--bs-navbar-padding-y:0.5rem;--bs-navbar-color:rgba(var(--bs-emphasis-color-rgb), 0.65);--bs-navbar-hover-color:rgba(var(--bs-emphasis-color-rgb), 0.8);--bs-navbar-disabled-color:rgba(var(--bs-emphasis-color-rgb), 0.3);--bs-navbar-active-color:rgba(var(--bs-emphasis-color-rgb), 1);--bs-navbar-brand-padding-y:0.3125rem;--bs-navbar-brand-margin-end:1rem;--bs-navbar-brand-font-size:1.25rem;--bs-navbar-brand-color:rgba(var(--bs-emphasis-color-rgb), 1);--bs-navbar-brand-hover-color:rgba(var(--bs-emphasis-color-rgb), 1);--bs-navbar-nav-link-padding-x:0.5rem;--bs-navbar-toggler-padding-y:0.25rem;--bs-navbar-toggler-padding-x:0.75rem;--bs-navbar-toggler-font-size:1.25rem;--bs-navbar-toggler-icon-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%2833, 37, 41, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");--bs-navbar-toggler-border-color:rgba(var(--bs-emphasis-color-rgb), 0.15);--bs-navbar-toggler-border-radius:var(--bs-border-radius);--bs-navbar-toggler-focus-width:0.25rem;--bs-navbar-toggler-transition:box-shadow 0.15s ease-in-out;position:relative;display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;padding:var(--bs-navbar-padding-y) var(--bs-navbar-padding-x)}.navbar>.container,.navbar>.container-fluid,.navbar>.container-lg,.navbar>.container-md,.navbar>.container-sm,.navbar>.container-xl,.navbar>.container-xxl{display:flex;flex-wrap:inherit;align-items:center;justify-content:space-between}.navbar-brand{padding-top:var(--bs-navbar-brand-padding-y);padding-bottom:var(--bs-navbar-brand-padding-y);margin-right:var(--bs-navbar-brand-margin-end);font-size:var(--bs-navbar-brand-font-size);color:var(--bs-navbar-brand-color);text-decoration:none;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{color:var(--bs-navbar-brand-hover-color)}.navbar-nav{--bs-nav-link-padding-x:0;--bs-nav-link-padding-y:0.5rem;--bs-nav-link-font-weight: ;--bs-nav-link-color:var(--bs-navbar-color);--bs-nav-link-hover-color:var(--bs-navbar-hover-color);--bs-nav-link-disabled-color:var(--bs-navbar-disabled-color);display:flex;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link.active,.navbar-nav .nav-link.show{color:var(--bs-navbar-active-color)}.navbar-nav .dropdown-menu{position:static}.navbar-text{padding-top:.5rem;padding-bottom:.5rem;color:var(--bs-navbar-color)}.navbar-text a,.navbar-text a:focus,.navbar-text a:hover{color:var(--bs-navbar-active-color)}.navbar-collapse{flex-basis:100%;flex-grow:1;align-items:center}.navbar-toggler{padding:var(--bs-navbar-toggler-padding-y) var(--bs-navbar-toggler-padding-x);font-size:var(--bs-navbar-toggler-font-size);line-height:1;color:var(--bs-navbar-color);background-color:transparent;border:var(--bs-border-width) solid var(--bs-navbar-toggler-border-color);border-radius:var(--bs-navbar-toggler-border-radius);transition:var(--bs-navbar-toggler-transition)}@media (prefers-reduced-motion:reduce){.navbar-toggler{transition:none}}.navbar-toggler:hover{text-decoration:none}.navbar-toggler:focus{text-decoration:none;outline:0;box-shadow:0 0 0 var(--bs-navbar-toggler-focus-width)}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;background-image:var(--bs-navbar-toggler-icon-bg);background-repeat:no-repeat;background-position:center;background-size:100%}.navbar-nav-scroll{max-height:var(--bs-scroll-height,75vh);overflow-y:auto}@media (min-width:576px){.navbar-expand-sm{flex-wrap:nowrap;justify-content:flex-start}.navbar-expand-sm .navbar-nav{flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:var(--bs-navbar-nav-link-padding-x);padding-left:var(--bs-navbar-nav-link-padding-x)}.navbar-expand-sm .navbar-nav-scroll{overflow:visible}.navbar-expand-sm .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}.navbar-expand-sm .offcanvas{position:static;z-index:auto;flex-grow:1;width:auto!important;height:auto!important;visibility:visible!important;background-color:transparent!important;border:0!important;transform:none!important;transition:none}.navbar-expand-sm .offcanvas .offcanvas-header{display:none}.navbar-expand-sm .offcanvas .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible}}@media (min-width:768px){.navbar-expand-md{flex-wrap:nowrap;justify-content:flex-start}.navbar-expand-md .navbar-nav{flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:var(--bs-navbar-nav-link-padding-x);padding-left:var(--bs-navbar-nav-link-padding-x)}.navbar-expand-md .navbar-nav-scroll{overflow:visible}.navbar-expand-md .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}.navbar-expand-md .offcanvas{position:static;z-index:auto;flex-grow:1;width:auto!important;height:auto!important;visibility:visible!important;background-color:transparent!important;border:0!important;transform:none!important;transition:none}.navbar-expand-md .offcanvas .offcanvas-header{display:none}.navbar-expand-md .offcanvas .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible}}@media (min-width:992px){.navbar-expand-lg{flex-wrap:nowrap;justify-content:flex-start}.navbar-expand-lg .navbar-nav{flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:var(--bs-navbar-nav-link-padding-x);padding-left:var(--bs-navbar-nav-link-padding-x)}.navbar-expand-lg .navbar-nav-scroll{overflow:visible}.navbar-expand-lg .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}.navbar-expand-lg .offcanvas{position:static;z-index:auto;flex-grow:1;width:auto!important;height:auto!important;visibility:visible!important;background-color:transparent!important;border:0!important;transform:none!important;transition:none}.navbar-expand-lg .offcanvas .offcanvas-header{display:none}.navbar-expand-lg .offcanvas .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible}}@media (min-width:1200px){.navbar-expand-xl{flex-wrap:nowrap;justify-content:flex-start}.navbar-expand-xl .navbar-nav{flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:var(--bs-navbar-nav-link-padding-x);padding-left:var(--bs-navbar-nav-link-padding-x)}.navbar-expand-xl .navbar-nav-scroll{overflow:visible}.navbar-expand-xl .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}.navbar-expand-xl .offcanvas{position:static;z-index:auto;flex-grow:1;width:auto!important;height:auto!important;visibility:visible!important;background-color:transparent!important;border:0!important;transform:none!important;transition:none}.navbar-expand-xl .offcanvas .offcanvas-header{display:none}.navbar-expand-xl .offcanvas .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible}}@media (min-width:1400px){.navbar-expand-xxl{flex-wrap:nowrap;justify-content:flex-start}.navbar-expand-xxl .navbar-nav{flex-direction:row}.navbar-expand-xxl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xxl .navbar-nav .nav-link{padding-right:var(--bs-navbar-nav-link-padding-x);padding-left:var(--bs-navbar-nav-link-padding-x)}.navbar-expand-xxl .navbar-nav-scroll{overflow:visible}.navbar-expand-xxl .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xxl .navbar-toggler{display:none}.navbar-expand-xxl .offcanvas{position:static;z-index:auto;flex-grow:1;width:auto!important;height:auto!important;visibility:visible!important;background-color:transparent!important;border:0!important;transform:none!important;transition:none}.navbar-expand-xxl .offcanvas .offcanvas-header{display:none}.navbar-expand-xxl .offcanvas .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible}}.navbar-expand{flex-wrap:nowrap;justify-content:flex-start}.navbar-expand .navbar-nav{flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:var(--bs-navbar-nav-link-padding-x);padding-left:var(--bs-navbar-nav-link-padding-x)}.navbar-expand .navbar-nav-scroll{overflow:visible}.navbar-expand .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-expand .offcanvas{position:static;z-index:auto;flex-grow:1;width:auto!important;height:auto!important;visibility:visible!important;background-color:transparent!important;border:0!important;transform:none!important;transition:none}.navbar-expand .offcanvas .offcanvas-header{display:none}.navbar-expand .offcanvas .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible}.navbar-dark,.navbar[data-bs-theme=dark]{--bs-navbar-color:rgba(255, 255, 255, 0.55);--bs-navbar-hover-color:rgba(255, 255, 255, 0.75);--bs-navbar-disabled-color:rgba(255, 255, 255, 0.25);--bs-navbar-active-color:#fff;--bs-navbar-brand-color:#fff;--bs-navbar-brand-hover-color:#fff;--bs-navbar-toggler-border-color:rgba(255, 255, 255, 0.1);--bs-navbar-toggler-icon-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}[data-bs-theme=dark] .navbar-toggler-icon{--bs-navbar-toggler-icon-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.card{--bs-card-spacer-y:1rem;--bs-card-spacer-x:1rem;--bs-card-title-spacer-y:0.5rem;--bs-card-title-color: ;--bs-card-subtitle-color: ;--bs-card-border-width:var(--bs-border-width);--bs-card-border-color:var(--bs-border-color-translucent);--bs-card-border-radius:var(--bs-border-radius);--bs-card-box-shadow: ;--bs-card-inner-border-radius:calc(var(--bs-border-radius) - (var(--bs-border-width)));--bs-card-cap-padding-y:0.5rem;--bs-card-cap-padding-x:1rem;--bs-card-cap-bg:rgba(var(--bs-body-color-rgb), 0.03);--bs-card-cap-color: ;--bs-card-height: ;--bs-card-color: ;--bs-card-bg:var(--bs-body-bg);--bs-card-img-overlay-padding:1rem;--bs-card-group-margin:0.75rem;position:relative;display:flex;flex-direction:column;min-width:0;height:var(--bs-card-height);color:var(--bs-body-color);word-wrap:break-word;background-color:var(--bs-card-bg);background-clip:border-box;border:var(--bs-card-border-width) solid var(--bs-card-border-color);border-radius:var(--bs-card-border-radius)}.card>hr{margin-right:0;margin-left:0}.card>.list-group{border-top:inherit;border-bottom:inherit}.card>.list-group:first-child{border-top-width:0;border-top-left-radius:var(--bs-card-inner-border-radius);border-top-right-radius:var(--bs-card-inner-border-radius)}.card>.list-group:last-child{border-bottom-width:0;border-bottom-right-radius:var(--bs-card-inner-border-radius);border-bottom-left-radius:var(--bs-card-inner-border-radius)}.card>.card-header+.list-group,.card>.list-group+.card-footer{border-top:0}.card-body{flex:1 1 auto;padding:var(--bs-card-spacer-y) var(--bs-card-spacer-x);color:var(--bs-card-color)}.card-title{margin-bottom:var(--bs-card-title-spacer-y);color:var(--bs-card-title-color)}.card-subtitle{margin-top:calc(-.5 * var(--bs-card-title-spacer-y));margin-bottom:0;color:var(--bs-card-subtitle-color)}.card-text:last-child{margin-bottom:0}.card-link+.card-link{margin-left:var(--bs-card-spacer-x)}.card-header{padding:var(--bs-card-cap-padding-y) var(--bs-card-cap-padding-x);margin-bottom:0;color:var(--bs-card-cap-color);background-color:var(--bs-card-cap-bg);border-bottom:var(--bs-card-border-width) solid var(--bs-card-border-color)}.card-header:first-child{border-radius:var(--bs-card-inner-border-radius) var(--bs-card-inner-border-radius) 0 0}.card-footer{padding:var(--bs-card-cap-padding-y) var(--bs-card-cap-padding-x);color:var(--bs-card-cap-color);background-color:var(--bs-card-cap-bg);border-top:var(--bs-card-border-width) solid var(--bs-card-border-color)}.card-footer:last-child{border-radius:0 0 var(--bs-card-inner-border-radius) var(--bs-card-inner-border-radius)}.card-header-tabs{margin-right:calc(-.5 * var(--bs-card-cap-padding-x));margin-bottom:calc(-1 * var(--bs-card-cap-padding-y));margin-left:calc(-.5 * var(--bs-card-cap-padding-x));border-bottom:0}.card-header-tabs .nav-link.active{background-color:var(--bs-card-bg);border-bottom-color:var(--bs-card-bg)}.card-header-pills{margin-right:calc(-.5 * var(--bs-card-cap-padding-x));margin-left:calc(-.5 * var(--bs-card-cap-padding-x))}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:var(--bs-card-img-overlay-padding);border-radius:var(--bs-card-inner-border-radius)}.card-img,.card-img-bottom,.card-img-top{width:100%}.card-img,.card-img-top{border-top-left-radius:var(--bs-card-inner-border-radius);border-top-right-radius:var(--bs-card-inner-border-radius)}.card-img,.card-img-bottom{border-bottom-right-radius:var(--bs-card-inner-border-radius);border-bottom-left-radius:var(--bs-card-inner-border-radius)}.card-group>.card{margin-bottom:var(--bs-card-group-margin)}@media (min-width:576px){.card-group{display:flex;flex-flow:row wrap}.card-group>.card{flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:not(:last-child) .card-header,.card-group>.card:not(:last-child) .card-img-top{border-top-right-radius:0}.card-group>.card:not(:last-child) .card-footer,.card-group>.card:not(:last-child) .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:not(:first-child) .card-header,.card-group>.card:not(:first-child) .card-img-top{border-top-left-radius:0}.card-group>.card:not(:first-child) .card-footer,.card-group>.card:not(:first-child) .card-img-bottom{border-bottom-left-radius:0}}.accordion{--bs-accordion-color:var(--bs-body-color);--bs-accordion-bg:var(--bs-body-bg);--bs-accordion-transition:color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,border-radius 0.15s ease;--bs-accordion-border-color:var(--bs-border-color);--bs-accordion-border-width:var(--bs-border-width);--bs-accordion-border-radius:var(--bs-border-radius);--bs-accordion-inner-border-radius:calc(var(--bs-border-radius) - (var(--bs-border-width)));--bs-accordion-btn-padding-x:1.25rem;--bs-accordion-btn-padding-y:1rem;--bs-accordion-btn-color:var(--bs-body-color);--bs-accordion-btn-bg:var(--bs-accordion-bg);--bs-accordion-btn-icon:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");--bs-accordion-btn-icon-width:1.25rem;--bs-accordion-btn-icon-transform:rotate(-180deg);--bs-accordion-btn-icon-transition:transform 0.2s ease-in-out;--bs-accordion-btn-active-icon:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23052c65'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");--bs-accordion-btn-focus-border-color:#86b7fe;--bs-accordion-btn-focus-box-shadow:0 0 0 0.25rem rgba(13, 110, 253, 0.25);--bs-accordion-body-padding-x:1.25rem;--bs-accordion-body-padding-y:1rem;--bs-accordion-active-color:var(--bs-primary-text-emphasis);--bs-accordion-active-bg:var(--bs-primary-bg-subtle)}.accordion-button{position:relative;display:flex;align-items:center;width:100%;padding:var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x);font-size:1rem;color:var(--bs-accordion-btn-color);text-align:left;background-color:var(--bs-accordion-btn-bg);border:0;border-radius:0;overflow-anchor:none;transition:var(--bs-accordion-transition)}@media (prefers-reduced-motion:reduce){.accordion-button{transition:none}}.accordion-button:not(.collapsed){color:var(--bs-accordion-active-color);background-color:var(--bs-accordion-active-bg);box-shadow:inset 0 calc(-1 * var(--bs-accordion-border-width)) 0 var(--bs-accordion-border-color)}.accordion-button:not(.collapsed)::after{background-image:var(--bs-accordion-btn-active-icon);transform:var(--bs-accordion-btn-icon-transform)}.accordion-button::after{flex-shrink:0;width:var(--bs-accordion-btn-icon-width);height:var(--bs-accordion-btn-icon-width);margin-left:auto;content:"";background-image:var(--bs-accordion-btn-icon);background-repeat:no-repeat;background-size:var(--bs-accordion-btn-icon-width);transition:var(--bs-accordion-btn-icon-transition)}@media (prefers-reduced-motion:reduce){.accordion-button::after{transition:none}}.accordion-button:hover{z-index:2}.accordion-button:focus{z-index:3;border-color:var(--bs-accordion-btn-focus-border-color);outline:0;box-shadow:var(--bs-accordion-btn-focus-box-shadow)}.accordion-header{margin-bottom:0}.accordion-item{color:var(--bs-accordion-color);background-color:var(--bs-accordion-bg);border:var(--bs-accordion-border-width) solid var(--bs-accordion-border-color)}.accordion-item:first-of-type{border-top-left-radius:var(--bs-accordion-border-radius);border-top-right-radius:var(--bs-accordion-border-radius)}.accordion-item:first-of-type .accordion-button{border-top-left-radius:var(--bs-accordion-inner-border-radius);border-top-right-radius:var(--bs-accordion-inner-border-radius)}.accordion-item:not(:first-of-type){border-top:0}.accordion-item:last-of-type{border-bottom-right-radius:var(--bs-accordion-border-radius);border-bottom-left-radius:var(--bs-accordion-border-radius)}.accordion-item:last-of-type .accordion-button.collapsed{border-bottom-right-radius:var(--bs-accordion-inner-border-radius);border-bottom-left-radius:var(--bs-accordion-inner-border-radius)}.accordion-item:last-of-type .accordion-collapse{border-bottom-right-radius:var(--bs-accordion-border-radius);border-bottom-left-radius:var(--bs-accordion-border-radius)}.accordion-body{padding:var(--bs-accordion-body-padding-y) var(--bs-accordion-body-padding-x)}.accordion-flush .accordion-collapse{border-width:0}.accordion-flush .accordion-item{border-right:0;border-left:0;border-radius:0}.accordion-flush .accordion-item:first-child{border-top:0}.accordion-flush .accordion-item:last-child{border-bottom:0}.accordion-flush .accordion-item .accordion-button,.accordion-flush .accordion-item .accordion-button.collapsed{border-radius:0}[data-bs-theme=dark] .accordion-button::after{--bs-accordion-btn-icon:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%236ea8fe'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");--bs-accordion-btn-active-icon:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%236ea8fe'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")}.breadcrumb{--bs-breadcrumb-padding-x:0;--bs-breadcrumb-padding-y:0;--bs-breadcrumb-margin-bottom:1rem;--bs-breadcrumb-bg: ;--bs-breadcrumb-border-radius: ;--bs-breadcrumb-divider-color:var(--bs-secondary-color);--bs-breadcrumb-item-padding-x:0.5rem;--bs-breadcrumb-item-active-color:var(--bs-secondary-color);display:flex;flex-wrap:wrap;padding:var(--bs-breadcrumb-padding-y) var(--bs-breadcrumb-padding-x);margin-bottom:var(--bs-breadcrumb-margin-bottom);font-size:var(--bs-breadcrumb-font-size);list-style:none;background-color:var(--bs-breadcrumb-bg);border-radius:var(--bs-breadcrumb-border-radius)}.breadcrumb-item+.breadcrumb-item{padding-left:var(--bs-breadcrumb-item-padding-x)}.breadcrumb-item+.breadcrumb-item::before{float:left;padding-right:var(--bs-breadcrumb-item-padding-x);color:var(--bs-breadcrumb-divider-color);content:var(--bs-breadcrumb-divider, "/")}.breadcrumb-item.active{color:var(--bs-breadcrumb-item-active-color)}.pagination{--bs-pagination-padding-x:0.75rem;--bs-pagination-padding-y:0.375rem;--bs-pagination-font-size:1rem;--bs-pagination-color:var(--bs-link-color);--bs-pagination-bg:var(--bs-body-bg);--bs-pagination-border-width:var(--bs-border-width);--bs-pagination-border-color:var(--bs-border-color);--bs-pagination-border-radius:var(--bs-border-radius);--bs-pagination-hover-color:var(--bs-link-hover-color);--bs-pagination-hover-bg:var(--bs-tertiary-bg);--bs-pagination-hover-border-color:var(--bs-border-color);--bs-pagination-focus-color:var(--bs-link-hover-color);--bs-pagination-focus-bg:var(--bs-secondary-bg);--bs-pagination-focus-box-shadow:0 0 0 0.25rem rgba(13, 110, 253, 0.25);--bs-pagination-active-color:#fff;--bs-pagination-active-bg:#0d6efd;--bs-pagination-active-border-color:#0d6efd;--bs-pagination-disabled-color:var(--bs-secondary-color);--bs-pagination-disabled-bg:var(--bs-secondary-bg);--bs-pagination-disabled-border-color:var(--bs-border-color);display:flex;padding-left:0;list-style:none}.page-link{position:relative;display:block;padding:var(--bs-pagination-padding-y) var(--bs-pagination-padding-x);font-size:var(--bs-pagination-font-size);color:var(--bs-pagination-color);text-decoration:none;background-color:var(--bs-pagination-bg);border:var(--bs-pagination-border-width) solid var(--bs-pagination-border-color);transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.page-link{transition:none}}.page-link:hover{z-index:2;color:var(--bs-pagination-hover-color);background-color:var(--bs-pagination-hover-bg);border-color:var(--bs-pagination-hover-border-color)}.page-link:focus{z-index:3;color:var(--bs-pagination-focus-color);background-color:var(--bs-pagination-focus-bg);outline:0;box-shadow:var(--bs-pagination-focus-box-shadow)}.active>.page-link,.page-link.active{z-index:3;color:var(--bs-pagination-active-color);background-color:var(--bs-pagination-active-bg);border-color:var(--bs-pagination-active-border-color)}.disabled>.page-link,.page-link.disabled{color:var(--bs-pagination-disabled-color);pointer-events:none;background-color:var(--bs-pagination-disabled-bg);border-color:var(--bs-pagination-disabled-border-color)}.page-item:not(:first-child) .page-link{margin-left:calc(var(--bs-border-width) * -1)}.page-item:first-child .page-link{border-top-left-radius:var(--bs-pagination-border-radius);border-bottom-left-radius:var(--bs-pagination-border-radius)}.page-item:last-child .page-link{border-top-right-radius:var(--bs-pagination-border-radius);border-bottom-right-radius:var(--bs-pagination-border-radius)}.pagination-lg{--bs-pagination-padding-x:1.5rem;--bs-pagination-padding-y:0.75rem;--bs-pagination-font-size:1.25rem;--bs-pagination-border-radius:var(--bs-border-radius-lg)}.pagination-sm{--bs-pagination-padding-x:0.5rem;--bs-pagination-padding-y:0.25rem;--bs-pagination-font-size:0.875rem;--bs-pagination-border-radius:var(--bs-border-radius-sm)}.badge{--bs-badge-padding-x:0.65em;--bs-badge-padding-y:0.35em;--bs-badge-font-size:0.75em;--bs-badge-font-weight:700;--bs-badge-color:#fff;--bs-badge-border-radius:var(--bs-border-radius);display:inline-block;padding:var(--bs-badge-padding-y) var(--bs-badge-padding-x);font-size:var(--bs-badge-font-size);font-weight:var(--bs-badge-font-weight);line-height:1;color:var(--bs-badge-color);text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:var(--bs-badge-border-radius)}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.alert{--bs-alert-bg:transparent;--bs-alert-padding-x:1rem;--bs-alert-padding-y:1rem;--bs-alert-margin-bottom:1rem;--bs-alert-color:inherit;--bs-alert-border-color:transparent;--bs-alert-border:var(--bs-border-width) solid var(--bs-alert-border-color);--bs-alert-border-radius:var(--bs-border-radius);--bs-alert-link-color:inherit;position:relative;padding:var(--bs-alert-padding-y) var(--bs-alert-padding-x);margin-bottom:var(--bs-alert-margin-bottom);color:var(--bs-alert-color);background-color:var(--bs-alert-bg);border:var(--bs-alert-border);border-radius:var(--bs-alert-border-radius)}.alert-heading{color:inherit}.alert-link{font-weight:700;color:var(--bs-alert-link-color)}.alert-dismissible{padding-right:3rem}.alert-dismissible .btn-close{position:absolute;top:0;right:0;z-index:2;padding:1.25rem 1rem}.alert-primary{--bs-alert-color:var(--bs-primary-text-emphasis);--bs-alert-bg:var(--bs-primary-bg-subtle);--bs-alert-border-color:var(--bs-primary-border-subtle);--bs-alert-link-color:var(--bs-primary-text-emphasis)}.alert-secondary{--bs-alert-color:var(--bs-secondary-text-emphasis);--bs-alert-bg:var(--bs-secondary-bg-subtle);--bs-alert-border-color:var(--bs-secondary-border-subtle);--bs-alert-link-color:var(--bs-secondary-text-emphasis)}.alert-success{--bs-alert-color:var(--bs-success-text-emphasis);--bs-alert-bg:var(--bs-success-bg-subtle);--bs-alert-border-color:var(--bs-success-border-subtle);--bs-alert-link-color:var(--bs-success-text-emphasis)}.alert-info{--bs-alert-color:var(--bs-info-text-emphasis);--bs-alert-bg:var(--bs-info-bg-subtle);--bs-alert-border-color:var(--bs-info-border-subtle);--bs-alert-link-color:var(--bs-info-text-emphasis)}.alert-warning{--bs-alert-color:var(--bs-warning-text-emphasis);--bs-alert-bg:var(--bs-warning-bg-subtle);--bs-alert-border-color:var(--bs-warning-border-subtle);--bs-alert-link-color:var(--bs-warning-text-emphasis)}.alert-danger{--bs-alert-color:var(--bs-danger-text-emphasis);--bs-alert-bg:var(--bs-danger-bg-subtle);--bs-alert-border-color:var(--bs-danger-border-subtle);--bs-alert-link-color:var(--bs-danger-text-emphasis)}.alert-light{--bs-alert-color:var(--bs-light-text-emphasis);--bs-alert-bg:var(--bs-light-bg-subtle);--bs-alert-border-color:var(--bs-light-border-subtle);--bs-alert-link-color:var(--bs-light-text-emphasis)}.alert-dark{--bs-alert-color:var(--bs-dark-text-emphasis);--bs-alert-bg:var(--bs-dark-bg-subtle);--bs-alert-border-color:var(--bs-dark-border-subtle);--bs-alert-link-color:var(--bs-dark-text-emphasis)}@keyframes progress-bar-stripes{0%{background-position-x:1rem}}.progress,.progress-stacked{--bs-progress-height:1rem;--bs-progress-font-size:0.75rem;--bs-progress-bg:var(--bs-secondary-bg);--bs-progress-border-radius:var(--bs-border-radius);--bs-progress-box-shadow:var(--bs-box-shadow-inset);--bs-progress-bar-color:#fff;--bs-progress-bar-bg:#0d6efd;--bs-progress-bar-transition:width 0.6s ease;display:flex;height:var(--bs-progress-height);overflow:hidden;font-size:var(--bs-progress-font-size);background-color:var(--bs-progress-bg);border-radius:var(--bs-progress-border-radius)}.progress-bar{display:flex;flex-direction:column;justify-content:center;overflow:hidden;color:var(--bs-progress-bar-color);text-align:center;white-space:nowrap;background-color:var(--bs-progress-bar-bg);transition:var(--bs-progress-bar-transition)}@media (prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:var(--bs-progress-height) var(--bs-progress-height)}.progress-stacked>.progress{overflow:visible}.progress-stacked>.progress>.progress-bar{width:100%}.progress-bar-animated{animation:1s linear infinite progress-bar-stripes}@media (prefers-reduced-motion:reduce){.progress-bar-animated{animation:none}}.list-group{--bs-list-group-color:var(--bs-body-color);--bs-list-group-bg:var(--bs-body-bg);--bs-list-group-border-color:var(--bs-border-color);--bs-list-group-border-width:var(--bs-border-width);--bs-list-group-border-radius:var(--bs-border-radius);--bs-list-group-item-padding-x:1rem;--bs-list-group-item-padding-y:0.5rem;--bs-list-group-action-color:var(--bs-secondary-color);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-tertiary-bg);--bs-list-group-action-active-color:var(--bs-body-color);--bs-list-group-action-active-bg:var(--bs-secondary-bg);--bs-list-group-disabled-color:var(--bs-secondary-color);--bs-list-group-disabled-bg:var(--bs-body-bg);--bs-list-group-active-color:#fff;--bs-list-group-active-bg:#0d6efd;--bs-list-group-active-border-color:#0d6efd;display:flex;flex-direction:column;padding-left:0;margin-bottom:0;border-radius:var(--bs-list-group-border-radius)}.list-group-numbered{list-style-type:none;counter-reset:section}.list-group-numbered>.list-group-item::before{content:counters(section, ".") ". ";counter-increment:section}.list-group-item-action{width:100%;color:var(--bs-list-group-action-color);text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{z-index:1;color:var(--bs-list-group-action-hover-color);text-decoration:none;background-color:var(--bs-list-group-action-hover-bg)}.list-group-item-action:active{color:var(--bs-list-group-action-active-color);background-color:var(--bs-list-group-action-active-bg)}.list-group-item{position:relative;display:block;padding:var(--bs-list-group-item-padding-y) var(--bs-list-group-item-padding-x);color:var(--bs-list-group-color);text-decoration:none;background-color:var(--bs-list-group-bg);border:var(--bs-list-group-border-width) solid var(--bs-list-group-border-color)}.list-group-item:first-child{border-top-left-radius:inherit;border-top-right-radius:inherit}.list-group-item:last-child{border-bottom-right-radius:inherit;border-bottom-left-radius:inherit}.list-group-item.disabled,.list-group-item:disabled{color:var(--bs-list-group-disabled-color);pointer-events:none;background-color:var(--bs-list-group-disabled-bg)}.list-group-item.active{z-index:2;color:var(--bs-list-group-active-color);background-color:var(--bs-list-group-active-bg);border-color:var(--bs-list-group-active-border-color)}.list-group-item+.list-group-item{border-top-width:0}.list-group-item+.list-group-item.active{margin-top:calc(-1 * var(--bs-list-group-border-width));border-top-width:var(--bs-list-group-border-width)}.list-group-horizontal{flex-direction:row}.list-group-horizontal>.list-group-item:first-child:not(:last-child){border-bottom-left-radius:var(--bs-list-group-border-radius);border-top-right-radius:0}.list-group-horizontal>.list-group-item:last-child:not(:first-child){border-top-right-radius:var(--bs-list-group-border-radius);border-bottom-left-radius:0}.list-group-horizontal>.list-group-item.active{margin-top:0}.list-group-horizontal>.list-group-item+.list-group-item{border-top-width:var(--bs-list-group-border-width);border-left-width:0}.list-group-horizontal>.list-group-item+.list-group-item.active{margin-left:calc(-1 * var(--bs-list-group-border-width));border-left-width:var(--bs-list-group-border-width)}@media (min-width:576px){.list-group-horizontal-sm{flex-direction:row}.list-group-horizontal-sm>.list-group-item:first-child:not(:last-child){border-bottom-left-radius:var(--bs-list-group-border-radius);border-top-right-radius:0}.list-group-horizontal-sm>.list-group-item:last-child:not(:first-child){border-top-right-radius:var(--bs-list-group-border-radius);border-bottom-left-radius:0}.list-group-horizontal-sm>.list-group-item.active{margin-top:0}.list-group-horizontal-sm>.list-group-item+.list-group-item{border-top-width:var(--bs-list-group-border-width);border-left-width:0}.list-group-horizontal-sm>.list-group-item+.list-group-item.active{margin-left:calc(-1 * var(--bs-list-group-border-width));border-left-width:var(--bs-list-group-border-width)}}@media (min-width:768px){.list-group-horizontal-md{flex-direction:row}.list-group-horizontal-md>.list-group-item:first-child:not(:last-child){border-bottom-left-radius:var(--bs-list-group-border-radius);border-top-right-radius:0}.list-group-horizontal-md>.list-group-item:last-child:not(:first-child){border-top-right-radius:var(--bs-list-group-border-radius);border-bottom-left-radius:0}.list-group-horizontal-md>.list-group-item.active{margin-top:0}.list-group-horizontal-md>.list-group-item+.list-group-item{border-top-width:var(--bs-list-group-border-width);border-left-width:0}.list-group-horizontal-md>.list-group-item+.list-group-item.active{margin-left:calc(-1 * var(--bs-list-group-border-width));border-left-width:var(--bs-list-group-border-width)}}@media (min-width:992px){.list-group-horizontal-lg{flex-direction:row}.list-group-horizontal-lg>.list-group-item:first-child:not(:last-child){border-bottom-left-radius:var(--bs-list-group-border-radius);border-top-right-radius:0}.list-group-horizontal-lg>.list-group-item:last-child:not(:first-child){border-top-right-radius:var(--bs-list-group-border-radius);border-bottom-left-radius:0}.list-group-horizontal-lg>.list-group-item.active{margin-top:0}.list-group-horizontal-lg>.list-group-item+.list-group-item{border-top-width:var(--bs-list-group-border-width);border-left-width:0}.list-group-horizontal-lg>.list-group-item+.list-group-item.active{margin-left:calc(-1 * var(--bs-list-group-border-width));border-left-width:var(--bs-list-group-border-width)}}@media (min-width:1200px){.list-group-horizontal-xl{flex-direction:row}.list-group-horizontal-xl>.list-group-item:first-child:not(:last-child){border-bottom-left-radius:var(--bs-list-group-border-radius);border-top-right-radius:0}.list-group-horizontal-xl>.list-group-item:last-child:not(:first-child){border-top-right-radius:var(--bs-list-group-border-radius);border-bottom-left-radius:0}.list-group-horizontal-xl>.list-group-item.active{margin-top:0}.list-group-horizontal-xl>.list-group-item+.list-group-item{border-top-width:var(--bs-list-group-border-width);border-left-width:0}.list-group-horizontal-xl>.list-group-item+.list-group-item.active{margin-left:calc(-1 * var(--bs-list-group-border-width));border-left-width:var(--bs-list-group-border-width)}}@media (min-width:1400px){.list-group-horizontal-xxl{flex-direction:row}.list-group-horizontal-xxl>.list-group-item:first-child:not(:last-child){border-bottom-left-radius:var(--bs-list-group-border-radius);border-top-right-radius:0}.list-group-horizontal-xxl>.list-group-item:last-child:not(:first-child){border-top-right-radius:var(--bs-list-group-border-radius);border-bottom-left-radius:0}.list-group-horizontal-xxl>.list-group-item.active{margin-top:0}.list-group-horizontal-xxl>.list-group-item+.list-group-item{border-top-width:var(--bs-list-group-border-width);border-left-width:0}.list-group-horizontal-xxl>.list-group-item+.list-group-item.active{margin-left:calc(-1 * var(--bs-list-group-border-width));border-left-width:var(--bs-list-group-border-width)}}.list-group-flush{border-radius:0}.list-group-flush>.list-group-item{border-width:0 0 var(--bs-list-group-border-width)}.list-group-flush>.list-group-item:last-child{border-bottom-width:0}.list-group-item-primary{--bs-list-group-color:var(--bs-primary-text-emphasis);--bs-list-group-bg:var(--bs-primary-bg-subtle);--bs-list-group-border-color:var(--bs-primary-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-primary-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-primary-border-subtle);--bs-list-group-active-color:var(--bs-primary-bg-subtle);--bs-list-group-active-bg:var(--bs-primary-text-emphasis);--bs-list-group-active-border-color:var(--bs-primary-text-emphasis)}.list-group-item-secondary{--bs-list-group-color:var(--bs-secondary-text-emphasis);--bs-list-group-bg:var(--bs-secondary-bg-subtle);--bs-list-group-border-color:var(--bs-secondary-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-secondary-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-secondary-border-subtle);--bs-list-group-active-color:var(--bs-secondary-bg-subtle);--bs-list-group-active-bg:var(--bs-secondary-text-emphasis);--bs-list-group-active-border-color:var(--bs-secondary-text-emphasis)}.list-group-item-success{--bs-list-group-color:var(--bs-success-text-emphasis);--bs-list-group-bg:var(--bs-success-bg-subtle);--bs-list-group-border-color:var(--bs-success-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-success-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-success-border-subtle);--bs-list-group-active-color:var(--bs-success-bg-subtle);--bs-list-group-active-bg:var(--bs-success-text-emphasis);--bs-list-group-active-border-color:var(--bs-success-text-emphasis)}.list-group-item-info{--bs-list-group-color:var(--bs-info-text-emphasis);--bs-list-group-bg:var(--bs-info-bg-subtle);--bs-list-group-border-color:var(--bs-info-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-info-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-info-border-subtle);--bs-list-group-active-color:var(--bs-info-bg-subtle);--bs-list-group-active-bg:var(--bs-info-text-emphasis);--bs-list-group-active-border-color:var(--bs-info-text-emphasis)}.list-group-item-warning{--bs-list-group-color:var(--bs-warning-text-emphasis);--bs-list-group-bg:var(--bs-warning-bg-subtle);--bs-list-group-border-color:var(--bs-warning-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-warning-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-warning-border-subtle);--bs-list-group-active-color:var(--bs-warning-bg-subtle);--bs-list-group-active-bg:var(--bs-warning-text-emphasis);--bs-list-group-active-border-color:var(--bs-warning-text-emphasis)}.list-group-item-danger{--bs-list-group-color:var(--bs-danger-text-emphasis);--bs-list-group-bg:var(--bs-danger-bg-subtle);--bs-list-group-border-color:var(--bs-danger-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-danger-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-danger-border-subtle);--bs-list-group-active-color:var(--bs-danger-bg-subtle);--bs-list-group-active-bg:var(--bs-danger-text-emphasis);--bs-list-group-active-border-color:var(--bs-danger-text-emphasis)}.list-group-item-light{--bs-list-group-color:var(--bs-light-text-emphasis);--bs-list-group-bg:var(--bs-light-bg-subtle);--bs-list-group-border-color:var(--bs-light-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-light-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-light-border-subtle);--bs-list-group-active-color:var(--bs-light-bg-subtle);--bs-list-group-active-bg:var(--bs-light-text-emphasis);--bs-list-group-active-border-color:var(--bs-light-text-emphasis)}.list-group-item-dark{--bs-list-group-color:var(--bs-dark-text-emphasis);--bs-list-group-bg:var(--bs-dark-bg-subtle);--bs-list-group-border-color:var(--bs-dark-border-subtle);--bs-list-group-action-hover-color:var(--bs-emphasis-color);--bs-list-group-action-hover-bg:var(--bs-dark-border-subtle);--bs-list-group-action-active-color:var(--bs-emphasis-color);--bs-list-group-action-active-bg:var(--bs-dark-border-subtle);--bs-list-group-active-color:var(--bs-dark-bg-subtle);--bs-list-group-active-bg:var(--bs-dark-text-emphasis);--bs-list-group-active-border-color:var(--bs-dark-text-emphasis)}.btn-close{--bs-btn-close-color:#000;--bs-btn-close-bg:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/%3e%3c/svg%3e");--bs-btn-close-opacity:0.5;--bs-btn-close-hover-opacity:0.75;--bs-btn-close-focus-shadow:0 0 0 0.25rem rgba(13, 110, 253, 0.25);--bs-btn-close-focus-opacity:1;--bs-btn-close-disabled-opacity:0.25;--bs-btn-close-white-filter:invert(1) grayscale(100%) brightness(200%);box-sizing:content-box;width:1em;height:1em;padding:.25em .25em;color:var(--bs-btn-close-color);background:transparent var(--bs-btn-close-bg) center/1em auto no-repeat;border:0;border-radius:.375rem;opacity:var(--bs-btn-close-opacity)}.btn-close:hover{color:var(--bs-btn-close-color);text-decoration:none;opacity:var(--bs-btn-close-hover-opacity)}.btn-close:focus{outline:0;box-shadow:var(--bs-btn-close-focus-shadow);opacity:var(--bs-btn-close-focus-opacity)}.btn-close.disabled,.btn-close:disabled{pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;opacity:var(--bs-btn-close-disabled-opacity)}.btn-close-white{filter:var(--bs-btn-close-white-filter)}[data-bs-theme=dark] .btn-close{filter:var(--bs-btn-close-white-filter)}.toast{--bs-toast-zindex:1090;--bs-toast-padding-x:0.75rem;--bs-toast-padding-y:0.5rem;--bs-toast-spacing:1.5rem;--bs-toast-max-width:350px;--bs-toast-font-size:0.875rem;--bs-toast-color: ;--bs-toast-bg:rgba(var(--bs-body-bg-rgb), 0.85);--bs-toast-border-width:var(--bs-border-width);--bs-toast-border-color:var(--bs-border-color-translucent);--bs-toast-border-radius:var(--bs-border-radius);--bs-toast-box-shadow:var(--bs-box-shadow);--bs-toast-header-color:var(--bs-secondary-color);--bs-toast-header-bg:rgba(var(--bs-body-bg-rgb), 0.85);--bs-toast-header-border-color:var(--bs-border-color-translucent);width:var(--bs-toast-max-width);max-width:100%;font-size:var(--bs-toast-font-size);color:var(--bs-toast-color);pointer-events:auto;background-color:var(--bs-toast-bg);background-clip:padding-box;border:var(--bs-toast-border-width) solid var(--bs-toast-border-color);box-shadow:var(--bs-toast-box-shadow);border-radius:var(--bs-toast-border-radius)}.toast.showing{opacity:0}.toast:not(.show){display:none}.toast-container{--bs-toast-zindex:1090;position:absolute;z-index:var(--bs-toast-zindex);width:-webkit-max-content;width:-moz-max-content;width:max-content;max-width:100%;pointer-events:none}.toast-container>:not(:last-child){margin-bottom:var(--bs-toast-spacing)}.toast-header{display:flex;align-items:center;padding:var(--bs-toast-padding-y) var(--bs-toast-padding-x);color:var(--bs-toast-header-color);background-color:var(--bs-toast-header-bg);background-clip:padding-box;border-bottom:var(--bs-toast-border-width) solid var(--bs-toast-header-border-color);border-top-left-radius:calc(var(--bs-toast-border-radius) - var(--bs-toast-border-width));border-top-right-radius:calc(var(--bs-toast-border-radius) - var(--bs-toast-border-width))}.toast-header .btn-close{margin-right:calc(-.5 * var(--bs-toast-padding-x));margin-left:var(--bs-toast-padding-x)}.toast-body{padding:var(--bs-toast-padding-x);word-wrap:break-word}.modal{--bs-modal-zindex:1055;--bs-modal-width:500px;--bs-modal-padding:1rem;--bs-modal-margin:0.5rem;--bs-modal-color: ;--bs-modal-bg:var(--bs-body-bg);--bs-modal-border-color:var(--bs-border-color-translucent);--bs-modal-border-width:var(--bs-border-width);--bs-modal-border-radius:var(--bs-border-radius-lg);--bs-modal-box-shadow:var(--bs-box-shadow-sm);--bs-modal-inner-border-radius:calc(var(--bs-border-radius-lg) - (var(--bs-border-width)));--bs-modal-header-padding-x:1rem;--bs-modal-header-padding-y:1rem;--bs-modal-header-padding:1rem 1rem;--bs-modal-header-border-color:var(--bs-border-color);--bs-modal-header-border-width:var(--bs-border-width);--bs-modal-title-line-height:1.5;--bs-modal-footer-gap:0.5rem;--bs-modal-footer-bg: ;--bs-modal-footer-border-color:var(--bs-border-color);--bs-modal-footer-border-width:var(--bs-border-width);position:fixed;top:0;left:0;z-index:var(--bs-modal-zindex);display:none;width:100%;height:100%;overflow-x:hidden;overflow-y:auto;outline:0}.modal-dialog{position:relative;width:auto;margin:var(--bs-modal-margin);pointer-events:none}.modal.fade .modal-dialog{transition:transform .3s ease-out;transform:translate(0,-50px)}@media (prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{transform:none}.modal.modal-static .modal-dialog{transform:scale(1.02)}.modal-dialog-scrollable{height:calc(100% - var(--bs-modal-margin) * 2)}.modal-dialog-scrollable .modal-content{max-height:100%;overflow:hidden}.modal-dialog-scrollable .modal-body{overflow-y:auto}.modal-dialog-centered{display:flex;align-items:center;min-height:calc(100% - var(--bs-modal-margin) * 2)}.modal-content{position:relative;display:flex;flex-direction:column;width:100%;color:var(--bs-modal-color);pointer-events:auto;background-color:var(--bs-modal-bg);background-clip:padding-box;border:var(--bs-modal-border-width) solid var(--bs-modal-border-color);border-radius:var(--bs-modal-border-radius);outline:0}.modal-backdrop{--bs-backdrop-zindex:1050;--bs-backdrop-bg:#000;--bs-backdrop-opacity:0.5;position:fixed;top:0;left:0;z-index:var(--bs-backdrop-zindex);width:100vw;height:100vh;background-color:var(--bs-backdrop-bg)}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:var(--bs-backdrop-opacity)}.modal-header{display:flex;flex-shrink:0;align-items:center;justify-content:space-between;padding:var(--bs-modal-header-padding);border-bottom:var(--bs-modal-header-border-width) solid var(--bs-modal-header-border-color);border-top-left-radius:var(--bs-modal-inner-border-radius);border-top-right-radius:var(--bs-modal-inner-border-radius)}.modal-header .btn-close{padding:calc(var(--bs-modal-header-padding-y) * .5) calc(var(--bs-modal-header-padding-x) * .5);margin:calc(-.5 * var(--bs-modal-header-padding-y)) calc(-.5 * var(--bs-modal-header-padding-x)) calc(-.5 * var(--bs-modal-header-padding-y)) auto}.modal-title{margin-bottom:0;line-height:var(--bs-modal-title-line-height)}.modal-body{position:relative;flex:1 1 auto;padding:var(--bs-modal-padding)}.modal-footer{display:flex;flex-shrink:0;flex-wrap:wrap;align-items:center;justify-content:flex-end;padding:calc(var(--bs-modal-padding) - var(--bs-modal-footer-gap) * .5);background-color:var(--bs-modal-footer-bg);border-top:var(--bs-modal-footer-border-width) solid var(--bs-modal-footer-border-color);border-bottom-right-radius:var(--bs-modal-inner-border-radius);border-bottom-left-radius:var(--bs-modal-inner-border-radius)}.modal-footer>*{margin:calc(var(--bs-modal-footer-gap) * .5)}@media (min-width:576px){.modal{--bs-modal-margin:1.75rem;--bs-modal-box-shadow:var(--bs-box-shadow)}.modal-dialog{max-width:var(--bs-modal-width);margin-right:auto;margin-left:auto}.modal-sm{--bs-modal-width:300px}}@media (min-width:992px){.modal-lg,.modal-xl{--bs-modal-width:800px}}@media (min-width:1200px){.modal-xl{--bs-modal-width:1140px}}.modal-fullscreen{width:100vw;max-width:none;height:100%;margin:0}.modal-fullscreen .modal-content{height:100%;border:0;border-radius:0}.modal-fullscreen .modal-footer,.modal-fullscreen .modal-header{border-radius:0}.modal-fullscreen .modal-body{overflow-y:auto}@media (max-width:575.98px){.modal-fullscreen-sm-down{width:100vw;max-width:none;height:100%;margin:0}.modal-fullscreen-sm-down .modal-content{height:100%;border:0;border-radius:0}.modal-fullscreen-sm-down .modal-footer,.modal-fullscreen-sm-down .modal-header{border-radius:0}.modal-fullscreen-sm-down .modal-body{overflow-y:auto}}@media (max-width:767.98px){.modal-fullscreen-md-down{width:100vw;max-width:none;height:100%;margin:0}.modal-fullscreen-md-down .modal-content{height:100%;border:0;border-radius:0}.modal-fullscreen-md-down .modal-footer,.modal-fullscreen-md-down .modal-header{border-radius:0}.modal-fullscreen-md-down .modal-body{overflow-y:auto}}@media (max-width:991.98px){.modal-fullscreen-lg-down{width:100vw;max-width:none;height:100%;margin:0}.modal-fullscreen-lg-down .modal-content{height:100%;border:0;border-radius:0}.modal-fullscreen-lg-down .modal-footer,.modal-fullscreen-lg-down .modal-header{border-radius:0}.modal-fullscreen-lg-down .modal-body{overflow-y:auto}}@media (max-width:1199.98px){.modal-fullscreen-xl-down{width:100vw;max-width:none;height:100%;margin:0}.modal-fullscreen-xl-down .modal-content{height:100%;border:0;border-radius:0}.modal-fullscreen-xl-down .modal-footer,.modal-fullscreen-xl-down .modal-header{border-radius:0}.modal-fullscreen-xl-down .modal-body{overflow-y:auto}}@media (max-width:1399.98px){.modal-fullscreen-xxl-down{width:100vw;max-width:none;height:100%;margin:0}.modal-fullscreen-xxl-down .modal-content{height:100%;border:0;border-radius:0}.modal-fullscreen-xxl-down .modal-footer,.modal-fullscreen-xxl-down .modal-header{border-radius:0}.modal-fullscreen-xxl-down .modal-body{overflow-y:auto}}.tooltip{--bs-tooltip-zindex:1080;--bs-tooltip-max-width:200px;--bs-tooltip-padding-x:0.5rem;--bs-tooltip-padding-y:0.25rem;--bs-tooltip-margin: ;--bs-tooltip-font-size:0.875rem;--bs-tooltip-color:var(--bs-body-bg);--bs-tooltip-bg:var(--bs-emphasis-color);--bs-tooltip-border-radius:var(--bs-border-radius);--bs-tooltip-opacity:0.9;--bs-tooltip-arrow-width:0.8rem;--bs-tooltip-arrow-height:0.4rem;z-index:var(--bs-tooltip-zindex);display:block;margin:var(--bs-tooltip-margin);font-family:var(--bs-font-sans-serif);font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;white-space:normal;word-spacing:normal;line-break:auto;font-size:var(--bs-tooltip-font-size);word-wrap:break-word;opacity:0}.tooltip.show{opacity:var(--bs-tooltip-opacity)}.tooltip .tooltip-arrow{display:block;width:var(--bs-tooltip-arrow-width);height:var(--bs-tooltip-arrow-height)}.tooltip .tooltip-arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[data-popper-placement^=top] .tooltip-arrow,.bs-tooltip-top .tooltip-arrow{bottom:calc(-1 * var(--bs-tooltip-arrow-height))}.bs-tooltip-auto[data-popper-placement^=top] .tooltip-arrow::before,.bs-tooltip-top .tooltip-arrow::before{top:-1px;border-width:var(--bs-tooltip-arrow-height) calc(var(--bs-tooltip-arrow-width) * .5) 0;border-top-color:var(--bs-tooltip-bg)}.bs-tooltip-auto[data-popper-placement^=right] .tooltip-arrow,.bs-tooltip-end .tooltip-arrow{left:calc(-1 * var(--bs-tooltip-arrow-height));width:var(--bs-tooltip-arrow-height);height:var(--bs-tooltip-arrow-width)}.bs-tooltip-auto[data-popper-placement^=right] .tooltip-arrow::before,.bs-tooltip-end .tooltip-arrow::before{right:-1px;border-width:calc(var(--bs-tooltip-arrow-width) * .5) var(--bs-tooltip-arrow-height) calc(var(--bs-tooltip-arrow-width) * .5) 0;border-right-color:var(--bs-tooltip-bg)}.bs-tooltip-auto[data-popper-placement^=bottom] .tooltip-arrow,.bs-tooltip-bottom .tooltip-arrow{top:calc(-1 * var(--bs-tooltip-arrow-height))}.bs-tooltip-auto[data-popper-placement^=bottom] .tooltip-arrow::before,.bs-tooltip-bottom .tooltip-arrow::before{bottom:-1px;border-width:0 calc(var(--bs-tooltip-arrow-width) * .5) var(--bs-tooltip-arrow-height);border-bottom-color:var(--bs-tooltip-bg)}.bs-tooltip-auto[data-popper-placement^=left] .tooltip-arrow,.bs-tooltip-start .tooltip-arrow{right:calc(-1 * var(--bs-tooltip-arrow-height));width:var(--bs-tooltip-arrow-height);height:var(--bs-tooltip-arrow-width)}.bs-tooltip-auto[data-popper-placement^=left] .tooltip-arrow::before,.bs-tooltip-start .tooltip-arrow::before{left:-1px;border-width:calc(var(--bs-tooltip-arrow-width) * .5) 0 calc(var(--bs-tooltip-arrow-width) * .5) var(--bs-tooltip-arrow-height);border-left-color:var(--bs-tooltip-bg)}.tooltip-inner{max-width:var(--bs-tooltip-max-width);padding:var(--bs-tooltip-padding-y) var(--bs-tooltip-padding-x);color:var(--bs-tooltip-color);text-align:center;background-color:var(--bs-tooltip-bg);border-radius:var(--bs-tooltip-border-radius)}.popover{--bs-popover-zindex:1070;--bs-popover-max-width:276px;--bs-popover-font-size:0.875rem;--bs-popover-bg:var(--bs-body-bg);--bs-popover-border-width:var(--bs-border-width);--bs-popover-border-color:var(--bs-border-color-translucent);--bs-popover-border-radius:var(--bs-border-radius-lg);--bs-popover-inner-border-radius:calc(var(--bs-border-radius-lg) - var(--bs-border-width));--bs-popover-box-shadow:var(--bs-box-shadow);--bs-popover-header-padding-x:1rem;--bs-popover-header-padding-y:0.5rem;--bs-popover-header-font-size:1rem;--bs-popover-header-color:inherit;--bs-popover-header-bg:var(--bs-secondary-bg);--bs-popover-body-padding-x:1rem;--bs-popover-body-padding-y:1rem;--bs-popover-body-color:var(--bs-body-color);--bs-popover-arrow-width:1rem;--bs-popover-arrow-height:0.5rem;--bs-popover-arrow-border:var(--bs-popover-border-color);z-index:var(--bs-popover-zindex);display:block;max-width:var(--bs-popover-max-width);font-family:var(--bs-font-sans-serif);font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;white-space:normal;word-spacing:normal;line-break:auto;font-size:var(--bs-popover-font-size);word-wrap:break-word;background-color:var(--bs-popover-bg);background-clip:padding-box;border:var(--bs-popover-border-width) solid var(--bs-popover-border-color);border-radius:var(--bs-popover-border-radius)}.popover .popover-arrow{display:block;width:var(--bs-popover-arrow-width);height:var(--bs-popover-arrow-height)}.popover .popover-arrow::after,.popover .popover-arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid;border-width:0}.bs-popover-auto[data-popper-placement^=top]>.popover-arrow,.bs-popover-top>.popover-arrow{bottom:calc(-1 * (var(--bs-popover-arrow-height)) - var(--bs-popover-border-width))}.bs-popover-auto[data-popper-placement^=top]>.popover-arrow::after,.bs-popover-auto[data-popper-placement^=top]>.popover-arrow::before,.bs-popover-top>.popover-arrow::after,.bs-popover-top>.popover-arrow::before{border-width:var(--bs-popover-arrow-height) calc(var(--bs-popover-arrow-width) * .5) 0}.bs-popover-auto[data-popper-placement^=top]>.popover-arrow::before,.bs-popover-top>.popover-arrow::before{bottom:0;border-top-color:var(--bs-popover-arrow-border)}.bs-popover-auto[data-popper-placement^=top]>.popover-arrow::after,.bs-popover-top>.popover-arrow::after{bottom:var(--bs-popover-border-width);border-top-color:var(--bs-popover-bg)}.bs-popover-auto[data-popper-placement^=right]>.popover-arrow,.bs-popover-end>.popover-arrow{left:calc(-1 * (var(--bs-popover-arrow-height)) - var(--bs-popover-border-width));width:var(--bs-popover-arrow-height);height:var(--bs-popover-arrow-width)}.bs-popover-auto[data-popper-placement^=right]>.popover-arrow::after,.bs-popover-auto[data-popper-placement^=right]>.popover-arrow::before,.bs-popover-end>.popover-arrow::after,.bs-popover-end>.popover-arrow::before{border-width:calc(var(--bs-popover-arrow-width) * .5) var(--bs-popover-arrow-height) calc(var(--bs-popover-arrow-width) * .5) 0}.bs-popover-auto[data-popper-placement^=right]>.popover-arrow::before,.bs-popover-end>.popover-arrow::before{left:0;border-right-color:var(--bs-popover-arrow-border)}.bs-popover-auto[data-popper-placement^=right]>.popover-arrow::after,.bs-popover-end>.popover-arrow::after{left:var(--bs-popover-border-width);border-right-color:var(--bs-popover-bg)}.bs-popover-auto[data-popper-placement^=bottom]>.popover-arrow,.bs-popover-bottom>.popover-arrow{top:calc(-1 * (var(--bs-popover-arrow-height)) - var(--bs-popover-border-width))}.bs-popover-auto[data-popper-placement^=bottom]>.popover-arrow::after,.bs-popover-auto[data-popper-placement^=bottom]>.popover-arrow::before,.bs-popover-bottom>.popover-arrow::after,.bs-popover-bottom>.popover-arrow::before{border-width:0 calc(var(--bs-popover-arrow-width) * .5) var(--bs-popover-arrow-height)}.bs-popover-auto[data-popper-placement^=bottom]>.popover-arrow::before,.bs-popover-bottom>.popover-arrow::before{top:0;border-bottom-color:var(--bs-popover-arrow-border)}.bs-popover-auto[data-popper-placement^=bottom]>.popover-arrow::after,.bs-popover-bottom>.popover-arrow::after{top:var(--bs-popover-border-width);border-bottom-color:var(--bs-popover-bg)}.bs-popover-auto[data-popper-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:var(--bs-popover-arrow-width);margin-left:calc(-.5 * var(--bs-popover-arrow-width));content:"";border-bottom:var(--bs-popover-border-width) solid var(--bs-popover-header-bg)}.bs-popover-auto[data-popper-placement^=left]>.popover-arrow,.bs-popover-start>.popover-arrow{right:calc(-1 * (var(--bs-popover-arrow-height)) - var(--bs-popover-border-width));width:var(--bs-popover-arrow-height);height:var(--bs-popover-arrow-width)}.bs-popover-auto[data-popper-placement^=left]>.popover-arrow::after,.bs-popover-auto[data-popper-placement^=left]>.popover-arrow::before,.bs-popover-start>.popover-arrow::after,.bs-popover-start>.popover-arrow::before{border-width:calc(var(--bs-popover-arrow-width) * .5) 0 calc(var(--bs-popover-arrow-width) * .5) var(--bs-popover-arrow-height)}.bs-popover-auto[data-popper-placement^=left]>.popover-arrow::before,.bs-popover-start>.popover-arrow::before{right:0;border-left-color:var(--bs-popover-arrow-border)}.bs-popover-auto[data-popper-placement^=left]>.popover-arrow::after,.bs-popover-start>.popover-arrow::after{right:var(--bs-popover-border-width);border-left-color:var(--bs-popover-bg)}.popover-header{padding:var(--bs-popover-header-padding-y) var(--bs-popover-header-padding-x);margin-bottom:0;font-size:var(--bs-popover-header-font-size);color:var(--bs-popover-header-color);background-color:var(--bs-popover-header-bg);border-bottom:var(--bs-popover-border-width) solid var(--bs-popover-border-color);border-top-left-radius:var(--bs-popover-inner-border-radius);border-top-right-radius:var(--bs-popover-inner-border-radius)}.popover-header:empty{display:none}.popover-body{padding:var(--bs-popover-body-padding-y) var(--bs-popover-body-padding-x);color:var(--bs-popover-body-color)}.carousel{position:relative}.carousel.pointer-event{touch-action:pan-y}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner::after{display:block;clear:both;content:""}.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:transform .6s ease-in-out}@media (prefers-reduced-motion:reduce){.carousel-item{transition:none}}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.active.carousel-item-end,.carousel-item-next:not(.carousel-item-start){transform:translateX(100%)}.active.carousel-item-start,.carousel-item-prev:not(.carousel-item-end){transform:translateX(-100%)}.carousel-fade .carousel-item{opacity:0;transition-property:opacity;transform:none}.carousel-fade .carousel-item-next.carousel-item-start,.carousel-fade .carousel-item-prev.carousel-item-end,.carousel-fade .carousel-item.active{z-index:1;opacity:1}.carousel-fade .active.carousel-item-end,.carousel-fade .active.carousel-item-start{z-index:0;opacity:0;transition:opacity 0s .6s}@media (prefers-reduced-motion:reduce){.carousel-fade .active.carousel-item-end,.carousel-fade .active.carousel-item-start{transition:none}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;z-index:1;display:flex;align-items:center;justify-content:center;width:15%;padding:0;color:#fff;text-align:center;background:0 0;border:0;opacity:.5;transition:opacity .15s ease}@media (prefers-reduced-motion:reduce){.carousel-control-next,.carousel-control-prev{transition:none}}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:2rem;height:2rem;background-repeat:no-repeat;background-position:50%;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e")}.carousel-control-next-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")}.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:2;display:flex;justify-content:center;padding:0;margin-right:15%;margin-bottom:1rem;margin-left:15%}.carousel-indicators [data-bs-target]{box-sizing:content-box;flex:0 1 auto;width:30px;height:3px;padding:0;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border:0;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;transition:opacity .6s ease}@media (prefers-reduced-motion:reduce){.carousel-indicators [data-bs-target]{transition:none}}.carousel-indicators .active{opacity:1}.carousel-caption{position:absolute;right:15%;bottom:1.25rem;left:15%;padding-top:1.25rem;padding-bottom:1.25rem;color:#fff;text-align:center}.carousel-dark .carousel-control-next-icon,.carousel-dark .carousel-control-prev-icon{filter:invert(1) grayscale(100)}.carousel-dark .carousel-indicators [data-bs-target]{background-color:#000}.carousel-dark .carousel-caption{color:#000}[data-bs-theme=dark] .carousel .carousel-control-next-icon,[data-bs-theme=dark] .carousel .carousel-control-prev-icon,[data-bs-theme=dark].carousel .carousel-control-next-icon,[data-bs-theme=dark].carousel .carousel-control-prev-icon{filter:invert(1) grayscale(100)}[data-bs-theme=dark] .carousel .carousel-indicators [data-bs-target],[data-bs-theme=dark].carousel .carousel-indicators [data-bs-target]{background-color:#000}[data-bs-theme=dark] .carousel .carousel-caption,[data-bs-theme=dark].carousel .carousel-caption{color:#000}.spinner-border,.spinner-grow{display:inline-block;width:var(--bs-spinner-width);height:var(--bs-spinner-height);vertical-align:var(--bs-spinner-vertical-align);border-radius:50%;animation:var(--bs-spinner-animation-speed) linear infinite var(--bs-spinner-animation-name)}@keyframes spinner-border{to{transform:rotate(360deg)}}.spinner-border{--bs-spinner-width:2rem;--bs-spinner-height:2rem;--bs-spinner-vertical-align:-0.125em;--bs-spinner-border-width:0.25em;--bs-spinner-animation-speed:0.75s;--bs-spinner-animation-name:spinner-border;border:var(--bs-spinner-border-width) solid currentcolor;border-right-color:transparent}.spinner-border-sm{--bs-spinner-width:1rem;--bs-spinner-height:1rem;--bs-spinner-border-width:0.2em}@keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1;transform:none}}.spinner-grow{--bs-spinner-width:2rem;--bs-spinner-height:2rem;--bs-spinner-vertical-align:-0.125em;--bs-spinner-animation-speed:0.75s;--bs-spinner-animation-name:spinner-grow;background-color:currentcolor;opacity:0}.spinner-grow-sm{--bs-spinner-width:1rem;--bs-spinner-height:1rem}@media (prefers-reduced-motion:reduce){.spinner-border,.spinner-grow{--bs-spinner-animation-speed:1.5s}}.offcanvas,.offcanvas-lg,.offcanvas-md,.offcanvas-sm,.offcanvas-xl,.offcanvas-xxl{--bs-offcanvas-zindex:1045;--bs-offcanvas-width:400px;--bs-offcanvas-height:30vh;--bs-offcanvas-padding-x:1rem;--bs-offcanvas-padding-y:1rem;--bs-offcanvas-color:var(--bs-body-color);--bs-offcanvas-bg:var(--bs-body-bg);--bs-offcanvas-border-width:var(--bs-border-width);--bs-offcanvas-border-color:var(--bs-border-color-translucent);--bs-offcanvas-box-shadow:var(--bs-box-shadow-sm);--bs-offcanvas-transition:transform 0.3s ease-in-out;--bs-offcanvas-title-line-height:1.5}@media (max-width:575.98px){.offcanvas-sm{position:fixed;bottom:0;z-index:var(--bs-offcanvas-zindex);display:flex;flex-direction:column;max-width:100%;color:var(--bs-offcanvas-color);visibility:hidden;background-color:var(--bs-offcanvas-bg);background-clip:padding-box;outline:0;transition:var(--bs-offcanvas-transition)}}@media (max-width:575.98px) and (prefers-reduced-motion:reduce){.offcanvas-sm{transition:none}}@media (max-width:575.98px){.offcanvas-sm.offcanvas-start{top:0;left:0;width:var(--bs-offcanvas-width);border-right:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(-100%)}.offcanvas-sm.offcanvas-end{top:0;right:0;width:var(--bs-offcanvas-width);border-left:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(100%)}.offcanvas-sm.offcanvas-top{top:0;right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-bottom:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(-100%)}.offcanvas-sm.offcanvas-bottom{right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-top:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(100%)}.offcanvas-sm.show:not(.hiding),.offcanvas-sm.showing{transform:none}.offcanvas-sm.hiding,.offcanvas-sm.show,.offcanvas-sm.showing{visibility:visible}}@media (min-width:576px){.offcanvas-sm{--bs-offcanvas-height:auto;--bs-offcanvas-border-width:0;background-color:transparent!important}.offcanvas-sm .offcanvas-header{display:none}.offcanvas-sm .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible;background-color:transparent!important}}@media (max-width:767.98px){.offcanvas-md{position:fixed;bottom:0;z-index:var(--bs-offcanvas-zindex);display:flex;flex-direction:column;max-width:100%;color:var(--bs-offcanvas-color);visibility:hidden;background-color:var(--bs-offcanvas-bg);background-clip:padding-box;outline:0;transition:var(--bs-offcanvas-transition)}}@media (max-width:767.98px) and (prefers-reduced-motion:reduce){.offcanvas-md{transition:none}}@media (max-width:767.98px){.offcanvas-md.offcanvas-start{top:0;left:0;width:var(--bs-offcanvas-width);border-right:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(-100%)}.offcanvas-md.offcanvas-end{top:0;right:0;width:var(--bs-offcanvas-width);border-left:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(100%)}.offcanvas-md.offcanvas-top{top:0;right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-bottom:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(-100%)}.offcanvas-md.offcanvas-bottom{right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-top:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(100%)}.offcanvas-md.show:not(.hiding),.offcanvas-md.showing{transform:none}.offcanvas-md.hiding,.offcanvas-md.show,.offcanvas-md.showing{visibility:visible}}@media (min-width:768px){.offcanvas-md{--bs-offcanvas-height:auto;--bs-offcanvas-border-width:0;background-color:transparent!important}.offcanvas-md .offcanvas-header{display:none}.offcanvas-md .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible;background-color:transparent!important}}@media (max-width:991.98px){.offcanvas-lg{position:fixed;bottom:0;z-index:var(--bs-offcanvas-zindex);display:flex;flex-direction:column;max-width:100%;color:var(--bs-offcanvas-color);visibility:hidden;background-color:var(--bs-offcanvas-bg);background-clip:padding-box;outline:0;transition:var(--bs-offcanvas-transition)}}@media (max-width:991.98px) and (prefers-reduced-motion:reduce){.offcanvas-lg{transition:none}}@media (max-width:991.98px){.offcanvas-lg.offcanvas-start{top:0;left:0;width:var(--bs-offcanvas-width);border-right:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(-100%)}.offcanvas-lg.offcanvas-end{top:0;right:0;width:var(--bs-offcanvas-width);border-left:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(100%)}.offcanvas-lg.offcanvas-top{top:0;right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-bottom:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(-100%)}.offcanvas-lg.offcanvas-bottom{right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-top:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(100%)}.offcanvas-lg.show:not(.hiding),.offcanvas-lg.showing{transform:none}.offcanvas-lg.hiding,.offcanvas-lg.show,.offcanvas-lg.showing{visibility:visible}}@media (min-width:992px){.offcanvas-lg{--bs-offcanvas-height:auto;--bs-offcanvas-border-width:0;background-color:transparent!important}.offcanvas-lg .offcanvas-header{display:none}.offcanvas-lg .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible;background-color:transparent!important}}@media (max-width:1199.98px){.offcanvas-xl{position:fixed;bottom:0;z-index:var(--bs-offcanvas-zindex);display:flex;flex-direction:column;max-width:100%;color:var(--bs-offcanvas-color);visibility:hidden;background-color:var(--bs-offcanvas-bg);background-clip:padding-box;outline:0;transition:var(--bs-offcanvas-transition)}}@media (max-width:1199.98px) and (prefers-reduced-motion:reduce){.offcanvas-xl{transition:none}}@media (max-width:1199.98px){.offcanvas-xl.offcanvas-start{top:0;left:0;width:var(--bs-offcanvas-width);border-right:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(-100%)}.offcanvas-xl.offcanvas-end{top:0;right:0;width:var(--bs-offcanvas-width);border-left:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(100%)}.offcanvas-xl.offcanvas-top{top:0;right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-bottom:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(-100%)}.offcanvas-xl.offcanvas-bottom{right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-top:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(100%)}.offcanvas-xl.show:not(.hiding),.offcanvas-xl.showing{transform:none}.offcanvas-xl.hiding,.offcanvas-xl.show,.offcanvas-xl.showing{visibility:visible}}@media (min-width:1200px){.offcanvas-xl{--bs-offcanvas-height:auto;--bs-offcanvas-border-width:0;background-color:transparent!important}.offcanvas-xl .offcanvas-header{display:none}.offcanvas-xl .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible;background-color:transparent!important}}@media (max-width:1399.98px){.offcanvas-xxl{position:fixed;bottom:0;z-index:var(--bs-offcanvas-zindex);display:flex;flex-direction:column;max-width:100%;color:var(--bs-offcanvas-color);visibility:hidden;background-color:var(--bs-offcanvas-bg);background-clip:padding-box;outline:0;transition:var(--bs-offcanvas-transition)}}@media (max-width:1399.98px) and (prefers-reduced-motion:reduce){.offcanvas-xxl{transition:none}}@media (max-width:1399.98px){.offcanvas-xxl.offcanvas-start{top:0;left:0;width:var(--bs-offcanvas-width);border-right:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(-100%)}.offcanvas-xxl.offcanvas-end{top:0;right:0;width:var(--bs-offcanvas-width);border-left:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(100%)}.offcanvas-xxl.offcanvas-top{top:0;right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-bottom:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(-100%)}.offcanvas-xxl.offcanvas-bottom{right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-top:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(100%)}.offcanvas-xxl.show:not(.hiding),.offcanvas-xxl.showing{transform:none}.offcanvas-xxl.hiding,.offcanvas-xxl.show,.offcanvas-xxl.showing{visibility:visible}}@media (min-width:1400px){.offcanvas-xxl{--bs-offcanvas-height:auto;--bs-offcanvas-border-width:0;background-color:transparent!important}.offcanvas-xxl .offcanvas-header{display:none}.offcanvas-xxl .offcanvas-body{display:flex;flex-grow:0;padding:0;overflow-y:visible;background-color:transparent!important}}.offcanvas{position:fixed;bottom:0;z-index:var(--bs-offcanvas-zindex);display:flex;flex-direction:column;max-width:100%;color:var(--bs-offcanvas-color);visibility:hidden;background-color:var(--bs-offcanvas-bg);background-clip:padding-box;outline:0;transition:var(--bs-offcanvas-transition)}@media (prefers-reduced-motion:reduce){.offcanvas{transition:none}}.offcanvas.offcanvas-start{top:0;left:0;width:var(--bs-offcanvas-width);border-right:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(-100%)}.offcanvas.offcanvas-end{top:0;right:0;width:var(--bs-offcanvas-width);border-left:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateX(100%)}.offcanvas.offcanvas-top{top:0;right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-bottom:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(-100%)}.offcanvas.offcanvas-bottom{right:0;left:0;height:var(--bs-offcanvas-height);max-height:100%;border-top:var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color);transform:translateY(100%)}.offcanvas.show:not(.hiding),.offcanvas.showing{transform:none}.offcanvas.hiding,.offcanvas.show,.offcanvas.showing{visibility:visible}.offcanvas-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#000}.offcanvas-backdrop.fade{opacity:0}.offcanvas-backdrop.show{opacity:.5}.offcanvas-header{display:flex;align-items:center;justify-content:space-between;padding:var(--bs-offcanvas-padding-y) var(--bs-offcanvas-padding-x)}.offcanvas-header .btn-close{padding:calc(var(--bs-offcanvas-padding-y) * .5) calc(var(--bs-offcanvas-padding-x) * .5);margin-top:calc(-.5 * var(--bs-offcanvas-padding-y));margin-right:calc(-.5 * var(--bs-offcanvas-padding-x));margin-bottom:calc(-.5 * var(--bs-offcanvas-padding-y))}.offcanvas-title{margin-bottom:0;line-height:var(--bs-offcanvas-title-line-height)}.offcanvas-body{flex-grow:1;padding:var(--bs-offcanvas-padding-y) var(--bs-offcanvas-padding-x);overflow-y:auto}.placeholder{display:inline-block;min-height:1em;vertical-align:middle;cursor:wait;background-color:currentcolor;opacity:.5}.placeholder.btn::before{display:inline-block;content:""}.placeholder-xs{min-height:.6em}.placeholder-sm{min-height:.8em}.placeholder-lg{min-height:1.2em}.placeholder-glow .placeholder{animation:placeholder-glow 2s ease-in-out infinite}@keyframes placeholder-glow{50%{opacity:.2}}.placeholder-wave{-webkit-mask-image:linear-gradient(130deg,#000 55%,rgba(0,0,0,0.8) 75%,#000 95%);mask-image:linear-gradient(130deg,#000 55%,rgba(0,0,0,0.8) 75%,#000 95%);-webkit-mask-size:200% 100%;mask-size:200% 100%;animation:placeholder-wave 2s linear infinite}@keyframes placeholder-wave{100%{-webkit-mask-position:-200% 0%;mask-position:-200% 0%}}.clearfix::after{display:block;clear:both;content:""}.text-bg-primary{color:#fff!important;background-color:RGBA(var(--bs-primary-rgb),var(--bs-bg-opacity,1))!important}.text-bg-secondary{color:#fff!important;background-color:RGBA(var(--bs-secondary-rgb),var(--bs-bg-opacity,1))!important}.text-bg-success{color:#fff!important;background-color:RGBA(var(--bs-success-rgb),var(--bs-bg-opacity,1))!important}.text-bg-info{color:#000!important;background-color:RGBA(var(--bs-info-rgb),var(--bs-bg-opacity,1))!important}.text-bg-warning{color:#000!important;background-color:RGBA(var(--bs-warning-rgb),var(--bs-bg-opacity,1))!important}.text-bg-danger{color:#fff!important;background-color:RGBA(var(--bs-danger-rgb),var(--bs-bg-opacity,1))!important}.text-bg-light{color:#000!important;background-color:RGBA(var(--bs-light-rgb),var(--bs-bg-opacity,1))!important}.text-bg-dark{color:#fff!important;background-color:RGBA(var(--bs-dark-rgb),var(--bs-bg-opacity,1))!important}.link-primary{color:RGBA(var(--bs-primary-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-primary-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-primary-rgb),var(--bs-link-underline-opacity,1))!important}.link-primary:focus,.link-primary:hover{color:RGBA(10,88,202,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(10,88,202,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(10,88,202,var(--bs-link-underline-opacity,1))!important}.link-secondary{color:RGBA(var(--bs-secondary-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-secondary-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-secondary-rgb),var(--bs-link-underline-opacity,1))!important}.link-secondary:focus,.link-secondary:hover{color:RGBA(86,94,100,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(86,94,100,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(86,94,100,var(--bs-link-underline-opacity,1))!important}.link-success{color:RGBA(var(--bs-success-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-success-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-success-rgb),var(--bs-link-underline-opacity,1))!important}.link-success:focus,.link-success:hover{color:RGBA(20,108,67,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(20,108,67,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(20,108,67,var(--bs-link-underline-opacity,1))!important}.link-info{color:RGBA(var(--bs-info-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-info-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-info-rgb),var(--bs-link-underline-opacity,1))!important}.link-info:focus,.link-info:hover{color:RGBA(61,213,243,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(61,213,243,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(61,213,243,var(--bs-link-underline-opacity,1))!important}.link-warning{color:RGBA(var(--bs-warning-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-warning-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-warning-rgb),var(--bs-link-underline-opacity,1))!important}.link-warning:focus,.link-warning:hover{color:RGBA(255,205,57,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(255,205,57,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(255,205,57,var(--bs-link-underline-opacity,1))!important}.link-danger{color:RGBA(var(--bs-danger-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-danger-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-danger-rgb),var(--bs-link-underline-opacity,1))!important}.link-danger:focus,.link-danger:hover{color:RGBA(176,42,55,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(176,42,55,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(176,42,55,var(--bs-link-underline-opacity,1))!important}.link-light{color:RGBA(var(--bs-light-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-light-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-light-rgb),var(--bs-link-underline-opacity,1))!important}.link-light:focus,.link-light:hover{color:RGBA(249,250,251,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(249,250,251,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(249,250,251,var(--bs-link-underline-opacity,1))!important}.link-dark{color:RGBA(var(--bs-dark-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-dark-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-dark-rgb),var(--bs-link-underline-opacity,1))!important}.link-dark:focus,.link-dark:hover{color:RGBA(26,30,33,var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(26,30,33,var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(26,30,33,var(--bs-link-underline-opacity,1))!important}.link-body-emphasis{color:RGBA(var(--bs-emphasis-color-rgb),var(--bs-link-opacity,1))!important;-webkit-text-decoration-color:RGBA(var(--bs-emphasis-color-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:RGBA(var(--bs-emphasis-color-rgb),var(--bs-link-underline-opacity,1))!important}.link-body-emphasis:focus,.link-body-emphasis:hover{color:RGBA(var(--bs-emphasis-color-rgb),var(--bs-link-opacity,.75))!important;-webkit-text-decoration-color:RGBA(var(--bs-emphasis-color-rgb),var(--bs-link-underline-opacity,0.75))!important;text-decoration-color:RGBA(var(--bs-emphasis-color-rgb),var(--bs-link-underline-opacity,0.75))!important}.focus-ring:focus{outline:0;box-shadow:var(--bs-focus-ring-x,0) var(--bs-focus-ring-y,0) var(--bs-focus-ring-blur,0) var(--bs-focus-ring-width) var(--bs-focus-ring-color)}.icon-link{display:inline-flex;gap:.375rem;align-items:center;-webkit-text-decoration-color:rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,0.5));text-decoration-color:rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,0.5));text-underline-offset:0.25em;-webkit-backface-visibility:hidden;backface-visibility:hidden}.icon-link>.bi{flex-shrink:0;width:1em;height:1em;fill:currentcolor;transition:.2s ease-in-out transform}@media (prefers-reduced-motion:reduce){.icon-link>.bi{transition:none}}.icon-link-hover:focus-visible>.bi,.icon-link-hover:hover>.bi{transform:var(--bs-icon-link-transform,translate3d(.25em,0,0))}.ratio{position:relative;width:100%}.ratio::before{display:block;padding-top:var(--bs-aspect-ratio);content:""}.ratio>*{position:absolute;top:0;left:0;width:100%;height:100%}.ratio-1x1{--bs-aspect-ratio:100%}.ratio-4x3{--bs-aspect-ratio:75%}.ratio-16x9{--bs-aspect-ratio:56.25%}.ratio-21x9{--bs-aspect-ratio:42.8571428571%}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.sticky-bottom{position:-webkit-sticky;position:sticky;bottom:0;z-index:1020}@media (min-width:576px){.sticky-sm-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.sticky-sm-bottom{position:-webkit-sticky;position:sticky;bottom:0;z-index:1020}}@media (min-width:768px){.sticky-md-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.sticky-md-bottom{position:-webkit-sticky;position:sticky;bottom:0;z-index:1020}}@media (min-width:992px){.sticky-lg-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.sticky-lg-bottom{position:-webkit-sticky;position:sticky;bottom:0;z-index:1020}}@media (min-width:1200px){.sticky-xl-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.sticky-xl-bottom{position:-webkit-sticky;position:sticky;bottom:0;z-index:1020}}@media (min-width:1400px){.sticky-xxl-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.sticky-xxl-bottom{position:-webkit-sticky;position:sticky;bottom:0;z-index:1020}}.hstack{display:flex;flex-direction:row;align-items:center;align-self:stretch}.vstack{display:flex;flex:1 1 auto;flex-direction:column;align-self:stretch}.visually-hidden,.visually-hidden-focusable:not(:focus):not(:focus-within){width:1px!important;height:1px!important;padding:0!important;margin:-1px!important;overflow:hidden!important;clip:rect(0,0,0,0)!important;white-space:nowrap!important;border:0!important}.visually-hidden-focusable:not(:focus):not(:focus-within):not(caption),.visually-hidden:not(caption){position:absolute!important}.stretched-link::after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;content:""}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vr{display:inline-block;align-self:stretch;width:var(--bs-border-width);min-height:1em;background-color:currentcolor;opacity:.25}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.float-start{float:left!important}.float-end{float:right!important}.float-none{float:none!important}.object-fit-contain{-o-object-fit:contain!important;object-fit:contain!important}.object-fit-cover{-o-object-fit:cover!important;object-fit:cover!important}.object-fit-fill{-o-object-fit:fill!important;object-fit:fill!important}.object-fit-scale{-o-object-fit:scale-down!important;object-fit:scale-down!important}.object-fit-none{-o-object-fit:none!important;object-fit:none!important}.opacity-0{opacity:0!important}.opacity-25{opacity:.25!important}.opacity-50{opacity:.5!important}.opacity-75{opacity:.75!important}.opacity-100{opacity:1!important}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.overflow-visible{overflow:visible!important}.overflow-scroll{overflow:scroll!important}.overflow-x-auto{overflow-x:auto!important}.overflow-x-hidden{overflow-x:hidden!important}.overflow-x-visible{overflow-x:visible!important}.overflow-x-scroll{overflow-x:scroll!important}.overflow-y-auto{overflow-y:auto!important}.overflow-y-hidden{overflow-y:hidden!important}.overflow-y-visible{overflow-y:visible!important}.overflow-y-scroll{overflow-y:scroll!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-grid{display:grid!important}.d-inline-grid{display:inline-grid!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:flex!important}.d-inline-flex{display:inline-flex!important}.d-none{display:none!important}.shadow{box-shadow:var(--bs-box-shadow)!important}.shadow-sm{box-shadow:var(--bs-box-shadow-sm)!important}.shadow-lg{box-shadow:var(--bs-box-shadow-lg)!important}.shadow-none{box-shadow:none!important}.focus-ring-primary{--bs-focus-ring-color:rgba(var(--bs-primary-rgb), var(--bs-focus-ring-opacity))}.focus-ring-secondary{--bs-focus-ring-color:rgba(var(--bs-secondary-rgb), var(--bs-focus-ring-opacity))}.focus-ring-success{--bs-focus-ring-color:rgba(var(--bs-success-rgb), var(--bs-focus-ring-opacity))}.focus-ring-info{--bs-focus-ring-color:rgba(var(--bs-info-rgb), var(--bs-focus-ring-opacity))}.focus-ring-warning{--bs-focus-ring-color:rgba(var(--bs-warning-rgb), var(--bs-focus-ring-opacity))}.focus-ring-danger{--bs-focus-ring-color:rgba(var(--bs-danger-rgb), var(--bs-focus-ring-opacity))}.focus-ring-light{--bs-focus-ring-color:rgba(var(--bs-light-rgb), var(--bs-focus-ring-opacity))}.focus-ring-dark{--bs-focus-ring-color:rgba(var(--bs-dark-rgb), var(--bs-focus-ring-opacity))}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.top-0{top:0!important}.top-50{top:50%!important}.top-100{top:100%!important}.bottom-0{bottom:0!important}.bottom-50{bottom:50%!important}.bottom-100{bottom:100%!important}.start-0{left:0!important}.start-50{left:50%!important}.start-100{left:100%!important}.end-0{right:0!important}.end-50{right:50%!important}.end-100{right:100%!important}.translate-middle{transform:translate(-50%,-50%)!important}.translate-middle-x{transform:translateX(-50%)!important}.translate-middle-y{transform:translateY(-50%)!important}.border{border:var(--bs-border-width) var(--bs-border-style) var(--bs-border-color)!important}.border-0{border:0!important}.border-top{border-top:var(--bs-border-width) var(--bs-border-style) var(--bs-border-color)!important}.border-top-0{border-top:0!important}.border-end{border-right:var(--bs-border-width) var(--bs-border-style) var(--bs-border-color)!important}.border-end-0{border-right:0!important}.border-bottom{border-bottom:var(--bs-border-width) var(--bs-border-style) var(--bs-border-color)!important}.border-bottom-0{border-bottom:0!important}.border-start{border-left:var(--bs-border-width) var(--bs-border-style) var(--bs-border-color)!important}.border-start-0{border-left:0!important}.border-primary{--bs-border-opacity:1;border-color:rgba(var(--bs-primary-rgb),var(--bs-border-opacity))!important}.border-secondary{--bs-border-opacity:1;border-color:rgba(var(--bs-secondary-rgb),var(--bs-border-opacity))!important}.border-success{--bs-border-opacity:1;border-color:rgba(var(--bs-success-rgb),var(--bs-border-opacity))!important}.border-info{--bs-border-opacity:1;border-color:rgba(var(--bs-info-rgb),var(--bs-border-opacity))!important}.border-warning{--bs-border-opacity:1;border-color:rgba(var(--bs-warning-rgb),var(--bs-border-opacity))!important}.border-danger{--bs-border-opacity:1;border-color:rgba(var(--bs-danger-rgb),var(--bs-border-opacity))!important}.border-light{--bs-border-opacity:1;border-color:rgba(var(--bs-light-rgb),var(--bs-border-opacity))!important}.border-dark{--bs-border-opacity:1;border-color:rgba(var(--bs-dark-rgb),var(--bs-border-opacity))!important}.border-black{--bs-border-opacity:1;border-color:rgba(var(--bs-black-rgb),var(--bs-border-opacity))!important}.border-white{--bs-border-opacity:1;border-color:rgba(var(--bs-white-rgb),var(--bs-border-opacity))!important}.border-primary-subtle{border-color:var(--bs-primary-border-subtle)!important}.border-secondary-subtle{border-color:var(--bs-secondary-border-subtle)!important}.border-success-subtle{border-color:var(--bs-success-border-subtle)!important}.border-info-subtle{border-color:var(--bs-info-border-subtle)!important}.border-warning-subtle{border-color:var(--bs-warning-border-subtle)!important}.border-danger-subtle{border-color:var(--bs-danger-border-subtle)!important}.border-light-subtle{border-color:var(--bs-light-border-subtle)!important}.border-dark-subtle{border-color:var(--bs-dark-border-subtle)!important}.border-1{border-width:1px!important}.border-2{border-width:2px!important}.border-3{border-width:3px!important}.border-4{border-width:4px!important}.border-5{border-width:5px!important}.border-opacity-10{--bs-border-opacity:0.1}.border-opacity-25{--bs-border-opacity:0.25}.border-opacity-50{--bs-border-opacity:0.5}.border-opacity-75{--bs-border-opacity:0.75}.border-opacity-100{--bs-border-opacity:1}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.mw-100{max-width:100%!important}.vw-100{width:100vw!important}.min-vw-100{min-width:100vw!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mh-100{max-height:100%!important}.vh-100{height:100vh!important}.min-vh-100{min-height:100vh!important}.flex-fill{flex:1 1 auto!important}.flex-row{flex-direction:row!important}.flex-column{flex-direction:column!important}.flex-row-reverse{flex-direction:row-reverse!important}.flex-column-reverse{flex-direction:column-reverse!important}.flex-grow-0{flex-grow:0!important}.flex-grow-1{flex-grow:1!important}.flex-shrink-0{flex-shrink:0!important}.flex-shrink-1{flex-shrink:1!important}.flex-wrap{flex-wrap:wrap!important}.flex-nowrap{flex-wrap:nowrap!important}.flex-wrap-reverse{flex-wrap:wrap-reverse!important}.justify-content-start{justify-content:flex-start!important}.justify-content-end{justify-content:flex-end!important}.justify-content-center{justify-content:center!important}.justify-content-between{justify-content:space-between!important}.justify-content-around{justify-content:space-around!important}.justify-content-evenly{justify-content:space-evenly!important}.align-items-start{align-items:flex-start!important}.align-items-end{align-items:flex-end!important}.align-items-center{align-items:center!important}.align-items-baseline{align-items:baseline!important}.align-items-stretch{align-items:stretch!important}.align-content-start{align-content:flex-start!important}.align-content-end{align-content:flex-end!important}.align-content-center{align-content:center!important}.align-content-between{align-content:space-between!important}.align-content-around{align-content:space-around!important}.align-content-stretch{align-content:stretch!important}.align-self-auto{align-self:auto!important}.align-self-start{align-self:flex-start!important}.align-self-end{align-self:flex-end!important}.align-self-center{align-self:center!important}.align-self-baseline{align-self:baseline!important}.align-self-stretch{align-self:stretch!important}.order-first{order:-1!important}.order-0{order:0!important}.order-1{order:1!important}.order-2{order:2!important}.order-3{order:3!important}.order-4{order:4!important}.order-5{order:5!important}.order-last{order:6!important}.m-0{margin:0!important}.m-1{margin:.25rem!important}.m-2{margin:.5rem!important}.m-3{margin:1rem!important}.m-4{margin:1.5rem!important}.m-5{margin:3rem!important}.m-auto{margin:auto!important}.mx-0{margin-right:0!important;margin-left:0!important}.mx-1{margin-right:.25rem!important;margin-left:.25rem!important}.mx-2{margin-right:.5rem!important;margin-left:.5rem!important}.mx-3{margin-right:1rem!important;margin-left:1rem!important}.mx-4{margin-right:1.5rem!important;margin-left:1.5rem!important}.mx-5{margin-right:3rem!important;margin-left:3rem!important}.mx-auto{margin-right:auto!important;margin-left:auto!important}.my-0{margin-top:0!important;margin-bottom:0!important}.my-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.my-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.my-3{margin-top:1rem!important;margin-bottom:1rem!important}.my-4{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.my-5{margin-top:3rem!important;margin-bottom:3rem!important}.my-auto{margin-top:auto!important;margin-bottom:auto!important}.mt-0{margin-top:0!important}.mt-1{margin-top:.25rem!important}.mt-2{margin-top:.5rem!important}.mt-3{margin-top:1rem!important}.mt-4{margin-top:1.5rem!important}.mt-5{margin-top:3rem!important}.mt-auto{margin-top:auto!important}.me-0{margin-right:0!important}.me-1{margin-right:.25rem!important}.me-2{margin-right:.5rem!important}.me-3{margin-right:1rem!important}.me-4{margin-right:1.5rem!important}.me-5{margin-right:3rem!important}.me-auto{margin-right:auto!important}.mb-0{margin-bottom:0!important}.mb-1{margin-bottom:.25rem!important}.mb-2{margin-bottom:.5rem!important}.mb-3{margin-bottom:1rem!important}.mb-4{margin-bottom:1.5rem!important}.mb-5{margin-bottom:3rem!important}.mb-auto{margin-bottom:auto!important}.ms-0{margin-left:0!important}.ms-1{margin-left:.25rem!important}.ms-2{margin-left:.5rem!important}.ms-3{margin-left:1rem!important}.ms-4{margin-left:1.5rem!important}.ms-5{margin-left:3rem!important}.ms-auto{margin-left:auto!important}.p-0{padding:0!important}.p-1{padding:.25rem!important}.p-2{padding:.5rem!important}.p-3{padding:1rem!important}.p-4{padding:1.5rem!important}.p-5{padding:3rem!important}.px-0{padding-right:0!important;padding-left:0!important}.px-1{padding-right:.25rem!important;padding-left:.25rem!important}.px-2{padding-right:.5rem!important;padding-left:.5rem!important}.px-3{padding-right:1rem!important;padding-left:1rem!important}.px-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.px-5{padding-right:3rem!important;padding-left:3rem!important}.py-0{padding-top:0!important;padding-bottom:0!important}.py-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.py-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.py-3{padding-top:1rem!important;padding-bottom:1rem!important}.py-4{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.py-5{padding-top:3rem!important;padding-bottom:3rem!important}.pt-0{padding-top:0!important}.pt-1{padding-top:.25rem!important}.pt-2{padding-top:.5rem!important}.pt-3{padding-top:1rem!important}.pt-4{padding-top:1.5rem!important}.pt-5{padding-top:3rem!important}.pe-0{padding-right:0!important}.pe-1{padding-right:.25rem!important}.pe-2{padding-right:.5rem!important}.pe-3{padding-right:1rem!important}.pe-4{padding-right:1.5rem!important}.pe-5{padding-right:3rem!important}.pb-0{padding-bottom:0!important}.pb-1{padding-bottom:.25rem!important}.pb-2{padding-bottom:.5rem!important}.pb-3{padding-bottom:1rem!important}.pb-4{padding-bottom:1.5rem!important}.pb-5{padding-bottom:3rem!important}.ps-0{padding-left:0!important}.ps-1{padding-left:.25rem!important}.ps-2{padding-left:.5rem!important}.ps-3{padding-left:1rem!important}.ps-4{padding-left:1.5rem!important}.ps-5{padding-left:3rem!important}.gap-0{gap:0!important}.gap-1{gap:.25rem!important}.gap-2{gap:.5rem!important}.gap-3{gap:1rem!important}.gap-4{gap:1.5rem!important}.gap-5{gap:3rem!important}.row-gap-0{row-gap:0!important}.row-gap-1{row-gap:.25rem!important}.row-gap-2{row-gap:.5rem!important}.row-gap-3{row-gap:1rem!important}.row-gap-4{row-gap:1.5rem!important}.row-gap-5{row-gap:3rem!important}.column-gap-0{-moz-column-gap:0!important;column-gap:0!important}.column-gap-1{-moz-column-gap:0.25rem!important;column-gap:.25rem!important}.column-gap-2{-moz-column-gap:0.5rem!important;column-gap:.5rem!important}.column-gap-3{-moz-column-gap:1rem!important;column-gap:1rem!important}.column-gap-4{-moz-column-gap:1.5rem!important;column-gap:1.5rem!important}.column-gap-5{-moz-column-gap:3rem!important;column-gap:3rem!important}.font-monospace{font-family:var(--bs-font-monospace)!important}.fs-1{font-size:calc(1.375rem + 1.5vw)!important}.fs-2{font-size:calc(1.325rem + .9vw)!important}.fs-3{font-size:calc(1.3rem + .6vw)!important}.fs-4{font-size:calc(1.275rem + .3vw)!important}.fs-5{font-size:1.25rem!important}.fs-6{font-size:1rem!important}.fst-italic{font-style:italic!important}.fst-normal{font-style:normal!important}.fw-lighter{font-weight:lighter!important}.fw-light{font-weight:300!important}.fw-normal{font-weight:400!important}.fw-medium{font-weight:500!important}.fw-semibold{font-weight:600!important}.fw-bold{font-weight:700!important}.fw-bolder{font-weight:bolder!important}.lh-1{line-height:1!important}.lh-sm{line-height:1.25!important}.lh-base{line-height:1.5!important}.lh-lg{line-height:2!important}.text-start{text-align:left!important}.text-end{text-align:right!important}.text-center{text-align:center!important}.text-decoration-none{text-decoration:none!important}.text-decoration-underline{text-decoration:underline!important}.text-decoration-line-through{text-decoration:line-through!important}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-break{word-wrap:break-word!important;word-break:break-word!important}.text-primary{--bs-text-opacity:1;color:rgba(var(--bs-primary-rgb),var(--bs-text-opacity))!important}.text-secondary{--bs-text-opacity:1;color:rgba(var(--bs-secondary-rgb),var(--bs-text-opacity))!important}.text-success{--bs-text-opacity:1;color:rgba(var(--bs-success-rgb),var(--bs-text-opacity))!important}.text-info{--bs-text-opacity:1;color:rgba(var(--bs-info-rgb),var(--bs-text-opacity))!important}.text-warning{--bs-text-opacity:1;color:rgba(var(--bs-warning-rgb),var(--bs-text-opacity))!important}.text-danger{--bs-text-opacity:1;color:rgba(var(--bs-danger-rgb),var(--bs-text-opacity))!important}.text-light{--bs-text-opacity:1;color:rgba(var(--bs-light-rgb),var(--bs-text-opacity))!important}.text-dark{--bs-text-opacity:1;color:rgba(var(--bs-dark-rgb),var(--bs-text-opacity))!important}.text-black{--bs-text-opacity:1;color:rgba(var(--bs-black-rgb),var(--bs-text-opacity))!important}.text-white{--bs-text-opacity:1;color:rgba(var(--bs-white-rgb),var(--bs-text-opacity))!important}.text-body{--bs-text-opacity:1;color:rgba(var(--bs-body-color-rgb),var(--bs-text-opacity))!important}.text-muted{--bs-text-opacity:1;color:var(--bs-secondary-color)!important}.text-black-50{--bs-text-opacity:1;color:rgba(0,0,0,.5)!important}.text-white-50{--bs-text-opacity:1;color:rgba(255,255,255,.5)!important}.text-body-secondary{--bs-text-opacity:1;color:var(--bs-secondary-color)!important}.text-body-tertiary{--bs-text-opacity:1;color:var(--bs-tertiary-color)!important}.text-body-emphasis{--bs-text-opacity:1;color:var(--bs-emphasis-color)!important}.text-reset{--bs-text-opacity:1;color:inherit!important}.text-opacity-25{--bs-text-opacity:0.25}.text-opacity-50{--bs-text-opacity:0.5}.text-opacity-75{--bs-text-opacity:0.75}.text-opacity-100{--bs-text-opacity:1}.text-primary-emphasis{color:var(--bs-primary-text-emphasis)!important}.text-secondary-emphasis{color:var(--bs-secondary-text-emphasis)!important}.text-success-emphasis{color:var(--bs-success-text-emphasis)!important}.text-info-emphasis{color:var(--bs-info-text-emphasis)!important}.text-warning-emphasis{color:var(--bs-warning-text-emphasis)!important}.text-danger-emphasis{color:var(--bs-danger-text-emphasis)!important}.text-light-emphasis{color:var(--bs-light-text-emphasis)!important}.text-dark-emphasis{color:var(--bs-dark-text-emphasis)!important}.link-opacity-10{--bs-link-opacity:0.1}.link-opacity-10-hover:hover{--bs-link-opacity:0.1}.link-opacity-25{--bs-link-opacity:0.25}.link-opacity-25-hover:hover{--bs-link-opacity:0.25}.link-opacity-50{--bs-link-opacity:0.5}.link-opacity-50-hover:hover{--bs-link-opacity:0.5}.link-opacity-75{--bs-link-opacity:0.75}.link-opacity-75-hover:hover{--bs-link-opacity:0.75}.link-opacity-100{--bs-link-opacity:1}.link-opacity-100-hover:hover{--bs-link-opacity:1}.link-offset-1{text-underline-offset:0.125em!important}.link-offset-1-hover:hover{text-underline-offset:0.125em!important}.link-offset-2{text-underline-offset:0.25em!important}.link-offset-2-hover:hover{text-underline-offset:0.25em!important}.link-offset-3{text-underline-offset:0.375em!important}.link-offset-3-hover:hover{text-underline-offset:0.375em!important}.link-underline-primary{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-primary-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-primary-rgb),var(--bs-link-underline-opacity))!important}.link-underline-secondary{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-secondary-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-secondary-rgb),var(--bs-link-underline-opacity))!important}.link-underline-success{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-success-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-success-rgb),var(--bs-link-underline-opacity))!important}.link-underline-info{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-info-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-info-rgb),var(--bs-link-underline-opacity))!important}.link-underline-warning{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-warning-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-warning-rgb),var(--bs-link-underline-opacity))!important}.link-underline-danger{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-danger-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-danger-rgb),var(--bs-link-underline-opacity))!important}.link-underline-light{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-light-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-light-rgb),var(--bs-link-underline-opacity))!important}.link-underline-dark{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-dark-rgb),var(--bs-link-underline-opacity))!important;text-decoration-color:rgba(var(--bs-dark-rgb),var(--bs-link-underline-opacity))!important}.link-underline{--bs-link-underline-opacity:1;-webkit-text-decoration-color:rgba(var(--bs-link-color-rgb),var(--bs-link-underline-opacity,1))!important;text-decoration-color:rgba(var(--bs-link-color-rgb),var(--bs-link-underline-opacity,1))!important}.link-underline-opacity-0{--bs-link-underline-opacity:0}.link-underline-opacity-0-hover:hover{--bs-link-underline-opacity:0}.link-underline-opacity-10{--bs-link-underline-opacity:0.1}.link-underline-opacity-10-hover:hover{--bs-link-underline-opacity:0.1}.link-underline-opacity-25{--bs-link-underline-opacity:0.25}.link-underline-opacity-25-hover:hover{--bs-link-underline-opacity:0.25}.link-underline-opacity-50{--bs-link-underline-opacity:0.5}.link-underline-opacity-50-hover:hover{--bs-link-underline-opacity:0.5}.link-underline-opacity-75{--bs-link-underline-opacity:0.75}.link-underline-opacity-75-hover:hover{--bs-link-underline-opacity:0.75}.link-underline-opacity-100{--bs-link-underline-opacity:1}.link-underline-opacity-100-hover:hover{--bs-link-underline-opacity:1}.bg-primary{--bs-bg-opacity:1;background-color:rgba(var(--bs-primary-rgb),var(--bs-bg-opacity))!important}.bg-secondary{--bs-bg-opacity:1;background-color:rgba(var(--bs-secondary-rgb),var(--bs-bg-opacity))!important}.bg-success{--bs-bg-opacity:1;background-color:rgba(var(--bs-success-rgb),var(--bs-bg-opacity))!important}.bg-info{--bs-bg-opacity:1;background-color:rgba(var(--bs-info-rgb),var(--bs-bg-opacity))!important}.bg-warning{--bs-bg-opacity:1;background-color:rgba(var(--bs-warning-rgb),var(--bs-bg-opacity))!important}.bg-danger{--bs-bg-opacity:1;background-color:rgba(var(--bs-danger-rgb),var(--bs-bg-opacity))!important}.bg-light{--bs-bg-opacity:1;background-color:rgba(var(--bs-light-rgb),var(--bs-bg-opacity))!important}.bg-dark{--bs-bg-opacity:1;background-color:rgba(var(--bs-dark-rgb),var(--bs-bg-opacity))!important}.bg-black{--bs-bg-opacity:1;background-color:rgba(var(--bs-black-rgb),var(--bs-bg-opacity))!important}.bg-white{--bs-bg-opacity:1;background-color:rgba(var(--bs-white-rgb),var(--bs-bg-opacity))!important}.bg-body{--bs-bg-opacity:1;background-color:rgba(var(--bs-body-bg-rgb),var(--bs-bg-opacity))!important}.bg-transparent{--bs-bg-opacity:1;background-color:transparent!important}.bg-body-secondary{--bs-bg-opacity:1;background-color:rgba(var(--bs-secondary-bg-rgb),var(--bs-bg-opacity))!important}.bg-body-tertiary{--bs-bg-opacity:1;background-color:rgba(var(--bs-tertiary-bg-rgb),var(--bs-bg-opacity))!important}.bg-opacity-10{--bs-bg-opacity:0.1}.bg-opacity-25{--bs-bg-opacity:0.25}.bg-opacity-50{--bs-bg-opacity:0.5}.bg-opacity-75{--bs-bg-opacity:0.75}.bg-opacity-100{--bs-bg-opacity:1}.bg-primary-subtle{background-color:var(--bs-primary-bg-subtle)!important}.bg-secondary-subtle{background-color:var(--bs-secondary-bg-subtle)!important}.bg-success-subtle{background-color:var(--bs-success-bg-subtle)!important}.bg-info-subtle{background-color:var(--bs-info-bg-subtle)!important}.bg-warning-subtle{background-color:var(--bs-warning-bg-subtle)!important}.bg-danger-subtle{background-color:var(--bs-danger-bg-subtle)!important}.bg-light-subtle{background-color:var(--bs-light-bg-subtle)!important}.bg-dark-subtle{background-color:var(--bs-dark-bg-subtle)!important}.bg-gradient{background-image:var(--bs-gradient)!important}.user-select-all{-webkit-user-select:all!important;-moz-user-select:all!important;user-select:all!important}.user-select-auto{-webkit-user-select:auto!important;-moz-user-select:auto!important;user-select:auto!important}.user-select-none{-webkit-user-select:none!important;-moz-user-select:none!important;user-select:none!important}.pe-none{pointer-events:none!important}.pe-auto{pointer-events:auto!important}.rounded{border-radius:var(--bs-border-radius)!important}.rounded-0{border-radius:0!important}.rounded-1{border-radius:var(--bs-border-radius-sm)!important}.rounded-2{border-radius:var(--bs-border-radius)!important}.rounded-3{border-radius:var(--bs-border-radius-lg)!important}.rounded-4{border-radius:var(--bs-border-radius-xl)!important}.rounded-5{border-radius:var(--bs-border-radius-xxl)!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:var(--bs-border-radius-pill)!important}.rounded-top{border-top-left-radius:var(--bs-border-radius)!important;border-top-right-radius:var(--bs-border-radius)!important}.rounded-top-0{border-top-left-radius:0!important;border-top-right-radius:0!important}.rounded-top-1{border-top-left-radius:var(--bs-border-radius-sm)!important;border-top-right-radius:var(--bs-border-radius-sm)!important}.rounded-top-2{border-top-left-radius:var(--bs-border-radius)!important;border-top-right-radius:var(--bs-border-radius)!important}.rounded-top-3{border-top-left-radius:var(--bs-border-radius-lg)!important;border-top-right-radius:var(--bs-border-radius-lg)!important}.rounded-top-4{border-top-left-radius:var(--bs-border-radius-xl)!important;border-top-right-radius:var(--bs-border-radius-xl)!important}.rounded-top-5{border-top-left-radius:var(--bs-border-radius-xxl)!important;border-top-right-radius:var(--bs-border-radius-xxl)!important}.rounded-top-circle{border-top-left-radius:50%!important;border-top-right-radius:50%!important}.rounded-top-pill{border-top-left-radius:var(--bs-border-radius-pill)!important;border-top-right-radius:var(--bs-border-radius-pill)!important}.rounded-end{border-top-right-radius:var(--bs-border-radius)!important;border-bottom-right-radius:var(--bs-border-radius)!important}.rounded-end-0{border-top-right-radius:0!important;border-bottom-right-radius:0!important}.rounded-end-1{border-top-right-radius:var(--bs-border-radius-sm)!important;border-bottom-right-radius:var(--bs-border-radius-sm)!important}.rounded-end-2{border-top-right-radius:var(--bs-border-radius)!important;border-bottom-right-radius:var(--bs-border-radius)!important}.rounded-end-3{border-top-right-radius:var(--bs-border-radius-lg)!important;border-bottom-right-radius:var(--bs-border-radius-lg)!important}.rounded-end-4{border-top-right-radius:var(--bs-border-radius-xl)!important;border-bottom-right-radius:var(--bs-border-radius-xl)!important}.rounded-end-5{border-top-right-radius:var(--bs-border-radius-xxl)!important;border-bottom-right-radius:var(--bs-border-radius-xxl)!important}.rounded-end-circle{border-top-right-radius:50%!important;border-bottom-right-radius:50%!important}.rounded-end-pill{border-top-right-radius:var(--bs-border-radius-pill)!important;border-bottom-right-radius:var(--bs-border-radius-pill)!important}.rounded-bottom{border-bottom-right-radius:var(--bs-border-radius)!important;border-bottom-left-radius:var(--bs-border-radius)!important}.rounded-bottom-0{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.rounded-bottom-1{border-bottom-right-radius:var(--bs-border-radius-sm)!important;border-bottom-left-radius:var(--bs-border-radius-sm)!important}.rounded-bottom-2{border-bottom-right-radius:var(--bs-border-radius)!important;border-bottom-left-radius:var(--bs-border-radius)!important}.rounded-bottom-3{border-bottom-right-radius:var(--bs-border-radius-lg)!important;border-bottom-left-radius:var(--bs-border-radius-lg)!important}.rounded-bottom-4{border-bottom-right-radius:var(--bs-border-radius-xl)!important;border-bottom-left-radius:var(--bs-border-radius-xl)!important}.rounded-bottom-5{border-bottom-right-radius:var(--bs-border-radius-xxl)!important;border-bottom-left-radius:var(--bs-border-radius-xxl)!important}.rounded-bottom-circle{border-bottom-right-radius:50%!important;border-bottom-left-radius:50%!important}.rounded-bottom-pill{border-bottom-right-radius:var(--bs-border-radius-pill)!important;border-bottom-left-radius:var(--bs-border-radius-pill)!important}.rounded-start{border-bottom-left-radius:var(--bs-border-radius)!important;border-top-left-radius:var(--bs-border-radius)!important}.rounded-start-0{border-bottom-left-radius:0!important;border-top-left-radius:0!important}.rounded-start-1{border-bottom-left-radius:var(--bs-border-radius-sm)!important;border-top-left-radius:var(--bs-border-radius-sm)!important}.rounded-start-2{border-bottom-left-radius:var(--bs-border-radius)!important;border-top-left-radius:var(--bs-border-radius)!important}.rounded-start-3{border-bottom-left-radius:var(--bs-border-radius-lg)!important;border-top-left-radius:var(--bs-border-radius-lg)!important}.rounded-start-4{border-bottom-left-radius:var(--bs-border-radius-xl)!important;border-top-left-radius:var(--bs-border-radius-xl)!important}.rounded-start-5{border-bottom-left-radius:var(--bs-border-radius-xxl)!important;border-top-left-radius:var(--bs-border-radius-xxl)!important}.rounded-start-circle{border-bottom-left-radius:50%!important;border-top-left-radius:50%!important}.rounded-start-pill{border-bottom-left-radius:var(--bs-border-radius-pill)!important;border-top-left-radius:var(--bs-border-radius-pill)!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}.z-n1{z-index:-1!important}.z-0{z-index:0!important}.z-1{z-index:1!important}.z-2{z-index:2!important}.z-3{z-index:3!important}@media (min-width:576px){.float-sm-start{float:left!important}.float-sm-end{float:right!important}.float-sm-none{float:none!important}.object-fit-sm-contain{-o-object-fit:contain!important;object-fit:contain!important}.object-fit-sm-cover{-o-object-fit:cover!important;object-fit:cover!important}.object-fit-sm-fill{-o-object-fit:fill!important;object-fit:fill!important}.object-fit-sm-scale{-o-object-fit:scale-down!important;object-fit:scale-down!important}.object-fit-sm-none{-o-object-fit:none!important;object-fit:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-grid{display:grid!important}.d-sm-inline-grid{display:inline-grid!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:flex!important}.d-sm-inline-flex{display:inline-flex!important}.d-sm-none{display:none!important}.flex-sm-fill{flex:1 1 auto!important}.flex-sm-row{flex-direction:row!important}.flex-sm-column{flex-direction:column!important}.flex-sm-row-reverse{flex-direction:row-reverse!important}.flex-sm-column-reverse{flex-direction:column-reverse!important}.flex-sm-grow-0{flex-grow:0!important}.flex-sm-grow-1{flex-grow:1!important}.flex-sm-shrink-0{flex-shrink:0!important}.flex-sm-shrink-1{flex-shrink:1!important}.flex-sm-wrap{flex-wrap:wrap!important}.flex-sm-nowrap{flex-wrap:nowrap!important}.flex-sm-wrap-reverse{flex-wrap:wrap-reverse!important}.justify-content-sm-start{justify-content:flex-start!important}.justify-content-sm-end{justify-content:flex-end!important}.justify-content-sm-center{justify-content:center!important}.justify-content-sm-between{justify-content:space-between!important}.justify-content-sm-around{justify-content:space-around!important}.justify-content-sm-evenly{justify-content:space-evenly!important}.align-items-sm-start{align-items:flex-start!important}.align-items-sm-end{align-items:flex-end!important}.align-items-sm-center{align-items:center!important}.align-items-sm-baseline{align-items:baseline!important}.align-items-sm-stretch{align-items:stretch!important}.align-content-sm-start{align-content:flex-start!important}.align-content-sm-end{align-content:flex-end!important}.align-content-sm-center{align-content:center!important}.align-content-sm-between{align-content:space-between!important}.align-content-sm-around{align-content:space-around!important}.align-content-sm-stretch{align-content:stretch!important}.align-self-sm-auto{align-self:auto!important}.align-self-sm-start{align-self:flex-start!important}.align-self-sm-end{align-self:flex-end!important}.align-self-sm-center{align-self:center!important}.align-self-sm-baseline{align-self:baseline!important}.align-self-sm-stretch{align-self:stretch!important}.order-sm-first{order:-1!important}.order-sm-0{order:0!important}.order-sm-1{order:1!important}.order-sm-2{order:2!important}.order-sm-3{order:3!important}.order-sm-4{order:4!important}.order-sm-5{order:5!important}.order-sm-last{order:6!important}.m-sm-0{margin:0!important}.m-sm-1{margin:.25rem!important}.m-sm-2{margin:.5rem!important}.m-sm-3{margin:1rem!important}.m-sm-4{margin:1.5rem!important}.m-sm-5{margin:3rem!important}.m-sm-auto{margin:auto!important}.mx-sm-0{margin-right:0!important;margin-left:0!important}.mx-sm-1{margin-right:.25rem!important;margin-left:.25rem!important}.mx-sm-2{margin-right:.5rem!important;margin-left:.5rem!important}.mx-sm-3{margin-right:1rem!important;margin-left:1rem!important}.mx-sm-4{margin-right:1.5rem!important;margin-left:1.5rem!important}.mx-sm-5{margin-right:3rem!important;margin-left:3rem!important}.mx-sm-auto{margin-right:auto!important;margin-left:auto!important}.my-sm-0{margin-top:0!important;margin-bottom:0!important}.my-sm-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.my-sm-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.my-sm-3{margin-top:1rem!important;margin-bottom:1rem!important}.my-sm-4{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.my-sm-5{margin-top:3rem!important;margin-bottom:3rem!important}.my-sm-auto{margin-top:auto!important;margin-bottom:auto!important}.mt-sm-0{margin-top:0!important}.mt-sm-1{margin-top:.25rem!important}.mt-sm-2{margin-top:.5rem!important}.mt-sm-3{margin-top:1rem!important}.mt-sm-4{margin-top:1.5rem!important}.mt-sm-5{margin-top:3rem!important}.mt-sm-auto{margin-top:auto!important}.me-sm-0{margin-right:0!important}.me-sm-1{margin-right:.25rem!important}.me-sm-2{margin-right:.5rem!important}.me-sm-3{margin-right:1rem!important}.me-sm-4{margin-right:1.5rem!important}.me-sm-5{margin-right:3rem!important}.me-sm-auto{margin-right:auto!important}.mb-sm-0{margin-bottom:0!important}.mb-sm-1{margin-bottom:.25rem!important}.mb-sm-2{margin-bottom:.5rem!important}.mb-sm-3{margin-bottom:1rem!important}.mb-sm-4{margin-bottom:1.5rem!important}.mb-sm-5{margin-bottom:3rem!important}.mb-sm-auto{margin-bottom:auto!important}.ms-sm-0{margin-left:0!important}.ms-sm-1{margin-left:.25rem!important}.ms-sm-2{margin-left:.5rem!important}.ms-sm-3{margin-left:1rem!important}.ms-sm-4{margin-left:1.5rem!important}.ms-sm-5{margin-left:3rem!important}.ms-sm-auto{margin-left:auto!important}.p-sm-0{padding:0!important}.p-sm-1{padding:.25rem!important}.p-sm-2{padding:.5rem!important}.p-sm-3{padding:1rem!important}.p-sm-4{padding:1.5rem!important}.p-sm-5{padding:3rem!important}.px-sm-0{padding-right:0!important;padding-left:0!important}.px-sm-1{padding-right:.25rem!important;padding-left:.25rem!important}.px-sm-2{padding-right:.5rem!important;padding-left:.5rem!important}.px-sm-3{padding-right:1rem!important;padding-left:1rem!important}.px-sm-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.px-sm-5{padding-right:3rem!important;padding-left:3rem!important}.py-sm-0{padding-top:0!important;padding-bottom:0!important}.py-sm-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.py-sm-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.py-sm-3{padding-top:1rem!important;padding-bottom:1rem!important}.py-sm-4{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.py-sm-5{padding-top:3rem!important;padding-bottom:3rem!important}.pt-sm-0{padding-top:0!important}.pt-sm-1{padding-top:.25rem!important}.pt-sm-2{padding-top:.5rem!important}.pt-sm-3{padding-top:1rem!important}.pt-sm-4{padding-top:1.5rem!important}.pt-sm-5{padding-top:3rem!important}.pe-sm-0{padding-right:0!important}.pe-sm-1{padding-right:.25rem!important}.pe-sm-2{padding-right:.5rem!important}.pe-sm-3{padding-right:1rem!important}.pe-sm-4{padding-right:1.5rem!important}.pe-sm-5{padding-right:3rem!important}.pb-sm-0{padding-bottom:0!important}.pb-sm-1{padding-bottom:.25rem!important}.pb-sm-2{padding-bottom:.5rem!important}.pb-sm-3{padding-bottom:1rem!important}.pb-sm-4{padding-bottom:1.5rem!important}.pb-sm-5{padding-bottom:3rem!important}.ps-sm-0{padding-left:0!important}.ps-sm-1{padding-left:.25rem!important}.ps-sm-2{padding-left:.5rem!important}.ps-sm-3{padding-left:1rem!important}.ps-sm-4{padding-left:1.5rem!important}.ps-sm-5{padding-left:3rem!important}.gap-sm-0{gap:0!important}.gap-sm-1{gap:.25rem!important}.gap-sm-2{gap:.5rem!important}.gap-sm-3{gap:1rem!important}.gap-sm-4{gap:1.5rem!important}.gap-sm-5{gap:3rem!important}.row-gap-sm-0{row-gap:0!important}.row-gap-sm-1{row-gap:.25rem!important}.row-gap-sm-2{row-gap:.5rem!important}.row-gap-sm-3{row-gap:1rem!important}.row-gap-sm-4{row-gap:1.5rem!important}.row-gap-sm-5{row-gap:3rem!important}.column-gap-sm-0{-moz-column-gap:0!important;column-gap:0!important}.column-gap-sm-1{-moz-column-gap:0.25rem!important;column-gap:.25rem!important}.column-gap-sm-2{-moz-column-gap:0.5rem!important;column-gap:.5rem!important}.column-gap-sm-3{-moz-column-gap:1rem!important;column-gap:1rem!important}.column-gap-sm-4{-moz-column-gap:1.5rem!important;column-gap:1.5rem!important}.column-gap-sm-5{-moz-column-gap:3rem!important;column-gap:3rem!important}.text-sm-start{text-align:left!important}.text-sm-end{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.float-md-start{float:left!important}.float-md-end{float:right!important}.float-md-none{float:none!important}.object-fit-md-contain{-o-object-fit:contain!important;object-fit:contain!important}.object-fit-md-cover{-o-object-fit:cover!important;object-fit:cover!important}.object-fit-md-fill{-o-object-fit:fill!important;object-fit:fill!important}.object-fit-md-scale{-o-object-fit:scale-down!important;object-fit:scale-down!important}.object-fit-md-none{-o-object-fit:none!important;object-fit:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-grid{display:grid!important}.d-md-inline-grid{display:inline-grid!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:flex!important}.d-md-inline-flex{display:inline-flex!important}.d-md-none{display:none!important}.flex-md-fill{flex:1 1 auto!important}.flex-md-row{flex-direction:row!important}.flex-md-column{flex-direction:column!important}.flex-md-row-reverse{flex-direction:row-reverse!important}.flex-md-column-reverse{flex-direction:column-reverse!important}.flex-md-grow-0{flex-grow:0!important}.flex-md-grow-1{flex-grow:1!important}.flex-md-shrink-0{flex-shrink:0!important}.flex-md-shrink-1{flex-shrink:1!important}.flex-md-wrap{flex-wrap:wrap!important}.flex-md-nowrap{flex-wrap:nowrap!important}.flex-md-wrap-reverse{flex-wrap:wrap-reverse!important}.justify-content-md-start{justify-content:flex-start!important}.justify-content-md-end{justify-content:flex-end!important}.justify-content-md-center{justify-content:center!important}.justify-content-md-between{justify-content:space-between!important}.justify-content-md-around{justify-content:space-around!important}.justify-content-md-evenly{justify-content:space-evenly!important}.align-items-md-start{align-items:flex-start!important}.align-items-md-end{align-items:flex-end!important}.align-items-md-center{align-items:center!important}.align-items-md-baseline{align-items:baseline!important}.align-items-md-stretch{align-items:stretch!important}.align-content-md-start{align-content:flex-start!important}.align-content-md-end{align-content:flex-end!important}.align-content-md-center{align-content:center!important}.align-content-md-between{align-content:space-between!important}.align-content-md-around{align-content:space-around!important}.align-content-md-stretch{align-content:stretch!important}.align-self-md-auto{align-self:auto!important}.align-self-md-start{align-self:flex-start!important}.align-self-md-end{align-self:flex-end!important}.align-self-md-center{align-self:center!important}.align-self-md-baseline{align-self:baseline!important}.align-self-md-stretch{align-self:stretch!important}.order-md-first{order:-1!important}.order-md-0{order:0!important}.order-md-1{order:1!important}.order-md-2{order:2!important}.order-md-3{order:3!important}.order-md-4{order:4!important}.order-md-5{order:5!important}.order-md-last{order:6!important}.m-md-0{margin:0!important}.m-md-1{margin:.25rem!important}.m-md-2{margin:.5rem!important}.m-md-3{margin:1rem!important}.m-md-4{margin:1.5rem!important}.m-md-5{margin:3rem!important}.m-md-auto{margin:auto!important}.mx-md-0{margin-right:0!important;margin-left:0!important}.mx-md-1{margin-right:.25rem!important;margin-left:.25rem!important}.mx-md-2{margin-right:.5rem!important;margin-left:.5rem!important}.mx-md-3{margin-right:1rem!important;margin-left:1rem!important}.mx-md-4{margin-right:1.5rem!important;margin-left:1.5rem!important}.mx-md-5{margin-right:3rem!important;margin-left:3rem!important}.mx-md-auto{margin-right:auto!important;margin-left:auto!important}.my-md-0{margin-top:0!important;margin-bottom:0!important}.my-md-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.my-md-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.my-md-3{margin-top:1rem!important;margin-bottom:1rem!important}.my-md-4{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.my-md-5{margin-top:3rem!important;margin-bottom:3rem!important}.my-md-auto{margin-top:auto!important;margin-bottom:auto!important}.mt-md-0{margin-top:0!important}.mt-md-1{margin-top:.25rem!important}.mt-md-2{margin-top:.5rem!important}.mt-md-3{margin-top:1rem!important}.mt-md-4{margin-top:1.5rem!important}.mt-md-5{margin-top:3rem!important}.mt-md-auto{margin-top:auto!important}.me-md-0{margin-right:0!important}.me-md-1{margin-right:.25rem!important}.me-md-2{margin-right:.5rem!important}.me-md-3{margin-right:1rem!important}.me-md-4{margin-right:1.5rem!important}.me-md-5{margin-right:3rem!important}.me-md-auto{margin-right:auto!important}.mb-md-0{margin-bottom:0!important}.mb-md-1{margin-bottom:.25rem!important}.mb-md-2{margin-bottom:.5rem!important}.mb-md-3{margin-bottom:1rem!important}.mb-md-4{margin-bottom:1.5rem!important}.mb-md-5{margin-bottom:3rem!important}.mb-md-auto{margin-bottom:auto!important}.ms-md-0{margin-left:0!important}.ms-md-1{margin-left:.25rem!important}.ms-md-2{margin-left:.5rem!important}.ms-md-3{margin-left:1rem!important}.ms-md-4{margin-left:1.5rem!important}.ms-md-5{margin-left:3rem!important}.ms-md-auto{margin-left:auto!important}.p-md-0{padding:0!important}.p-md-1{padding:.25rem!important}.p-md-2{padding:.5rem!important}.p-md-3{padding:1rem!important}.p-md-4{padding:1.5rem!important}.p-md-5{padding:3rem!important}.px-md-0{padding-right:0!important;padding-left:0!important}.px-md-1{padding-right:.25rem!important;padding-left:.25rem!important}.px-md-2{padding-right:.5rem!important;padding-left:.5rem!important}.px-md-3{padding-right:1rem!important;padding-left:1rem!important}.px-md-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.px-md-5{padding-right:3rem!important;padding-left:3rem!important}.py-md-0{padding-top:0!important;padding-bottom:0!important}.py-md-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.py-md-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.py-md-3{padding-top:1rem!important;padding-bottom:1rem!important}.py-md-4{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.py-md-5{padding-top:3rem!important;padding-bottom:3rem!important}.pt-md-0{padding-top:0!important}.pt-md-1{padding-top:.25rem!important}.pt-md-2{padding-top:.5rem!important}.pt-md-3{padding-top:1rem!important}.pt-md-4{padding-top:1.5rem!important}.pt-md-5{padding-top:3rem!important}.pe-md-0{padding-right:0!important}.pe-md-1{padding-right:.25rem!important}.pe-md-2{padding-right:.5rem!important}.pe-md-3{padding-right:1rem!important}.pe-md-4{padding-right:1.5rem!important}.pe-md-5{padding-right:3rem!important}.pb-md-0{padding-bottom:0!important}.pb-md-1{padding-bottom:.25rem!important}.pb-md-2{padding-bottom:.5rem!important}.pb-md-3{padding-bottom:1rem!important}.pb-md-4{padding-bottom:1.5rem!important}.pb-md-5{padding-bottom:3rem!important}.ps-md-0{padding-left:0!important}.ps-md-1{padding-left:.25rem!important}.ps-md-2{padding-left:.5rem!important}.ps-md-3{padding-left:1rem!important}.ps-md-4{padding-left:1.5rem!important}.ps-md-5{padding-left:3rem!important}.gap-md-0{gap:0!important}.gap-md-1{gap:.25rem!important}.gap-md-2{gap:.5rem!important}.gap-md-3{gap:1rem!important}.gap-md-4{gap:1.5rem!important}.gap-md-5{gap:3rem!important}.row-gap-md-0{row-gap:0!important}.row-gap-md-1{row-gap:.25rem!important}.row-gap-md-2{row-gap:.5rem!important}.row-gap-md-3{row-gap:1rem!important}.row-gap-md-4{row-gap:1.5rem!important}.row-gap-md-5{row-gap:3rem!important}.column-gap-md-0{-moz-column-gap:0!important;column-gap:0!important}.column-gap-md-1{-moz-column-gap:0.25rem!important;column-gap:.25rem!important}.column-gap-md-2{-moz-column-gap:0.5rem!important;column-gap:.5rem!important}.column-gap-md-3{-moz-column-gap:1rem!important;column-gap:1rem!important}.column-gap-md-4{-moz-column-gap:1.5rem!important;column-gap:1.5rem!important}.column-gap-md-5{-moz-column-gap:3rem!important;column-gap:3rem!important}.text-md-start{text-align:left!important}.text-md-end{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.float-lg-start{float:left!important}.float-lg-end{float:right!important}.float-lg-none{float:none!important}.object-fit-lg-contain{-o-object-fit:contain!important;object-fit:contain!important}.object-fit-lg-cover{-o-object-fit:cover!important;object-fit:cover!important}.object-fit-lg-fill{-o-object-fit:fill!important;object-fit:fill!important}.object-fit-lg-scale{-o-object-fit:scale-down!important;object-fit:scale-down!important}.object-fit-lg-none{-o-object-fit:none!important;object-fit:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-grid{display:grid!important}.d-lg-inline-grid{display:inline-grid!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:flex!important}.d-lg-inline-flex{display:inline-flex!important}.d-lg-none{display:none!important}.flex-lg-fill{flex:1 1 auto!important}.flex-lg-row{flex-direction:row!important}.flex-lg-column{flex-direction:column!important}.flex-lg-row-reverse{flex-direction:row-reverse!important}.flex-lg-column-reverse{flex-direction:column-reverse!important}.flex-lg-grow-0{flex-grow:0!important}.flex-lg-grow-1{flex-grow:1!important}.flex-lg-shrink-0{flex-shrink:0!important}.flex-lg-shrink-1{flex-shrink:1!important}.flex-lg-wrap{flex-wrap:wrap!important}.flex-lg-nowrap{flex-wrap:nowrap!important}.flex-lg-wrap-reverse{flex-wrap:wrap-reverse!important}.justify-content-lg-start{justify-content:flex-start!important}.justify-content-lg-end{justify-content:flex-end!important}.justify-content-lg-center{justify-content:center!important}.justify-content-lg-between{justify-content:space-between!important}.justify-content-lg-around{justify-content:space-around!important}.justify-content-lg-evenly{justify-content:space-evenly!important}.align-items-lg-start{align-items:flex-start!important}.align-items-lg-end{align-items:flex-end!important}.align-items-lg-center{align-items:center!important}.align-items-lg-baseline{align-items:baseline!important}.align-items-lg-stretch{align-items:stretch!important}.align-content-lg-start{align-content:flex-start!important}.align-content-lg-end{align-content:flex-end!important}.align-content-lg-center{align-content:center!important}.align-content-lg-between{align-content:space-between!important}.align-content-lg-around{align-content:space-around!important}.align-content-lg-stretch{align-content:stretch!important}.align-self-lg-auto{align-self:auto!important}.align-self-lg-start{align-self:flex-start!important}.align-self-lg-end{align-self:flex-end!important}.align-self-lg-center{align-self:center!important}.align-self-lg-baseline{align-self:baseline!important}.align-self-lg-stretch{align-self:stretch!important}.order-lg-first{order:-1!important}.order-lg-0{order:0!important}.order-lg-1{order:1!important}.order-lg-2{order:2!important}.order-lg-3{order:3!important}.order-lg-4{order:4!important}.order-lg-5{order:5!important}.order-lg-last{order:6!important}.m-lg-0{margin:0!important}.m-lg-1{margin:.25rem!important}.m-lg-2{margin:.5rem!important}.m-lg-3{margin:1rem!important}.m-lg-4{margin:1.5rem!important}.m-lg-5{margin:3rem!important}.m-lg-auto{margin:auto!important}.mx-lg-0{margin-right:0!important;margin-left:0!important}.mx-lg-1{margin-right:.25rem!important;margin-left:.25rem!important}.mx-lg-2{margin-right:.5rem!important;margin-left:.5rem!important}.mx-lg-3{margin-right:1rem!important;margin-left:1rem!important}.mx-lg-4{margin-right:1.5rem!important;margin-left:1.5rem!important}.mx-lg-5{margin-right:3rem!important;margin-left:3rem!important}.mx-lg-auto{margin-right:auto!important;margin-left:auto!important}.my-lg-0{margin-top:0!important;margin-bottom:0!important}.my-lg-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.my-lg-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.my-lg-3{margin-top:1rem!important;margin-bottom:1rem!important}.my-lg-4{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.my-lg-5{margin-top:3rem!important;margin-bottom:3rem!important}.my-lg-auto{margin-top:auto!important;margin-bottom:auto!important}.mt-lg-0{margin-top:0!important}.mt-lg-1{margin-top:.25rem!important}.mt-lg-2{margin-top:.5rem!important}.mt-lg-3{margin-top:1rem!important}.mt-lg-4{margin-top:1.5rem!important}.mt-lg-5{margin-top:3rem!important}.mt-lg-auto{margin-top:auto!important}.me-lg-0{margin-right:0!important}.me-lg-1{margin-right:.25rem!important}.me-lg-2{margin-right:.5rem!important}.me-lg-3{margin-right:1rem!important}.me-lg-4{margin-right:1.5rem!important}.me-lg-5{margin-right:3rem!important}.me-lg-auto{margin-right:auto!important}.mb-lg-0{margin-bottom:0!important}.mb-lg-1{margin-bottom:.25rem!important}.mb-lg-2{margin-bottom:.5rem!important}.mb-lg-3{margin-bottom:1rem!important}.mb-lg-4{margin-bottom:1.5rem!important}.mb-lg-5{margin-bottom:3rem!important}.mb-lg-auto{margin-bottom:auto!important}.ms-lg-0{margin-left:0!important}.ms-lg-1{margin-left:.25rem!important}.ms-lg-2{margin-left:.5rem!important}.ms-lg-3{margin-left:1rem!important}.ms-lg-4{margin-left:1.5rem!important}.ms-lg-5{margin-left:3rem!important}.ms-lg-auto{margin-left:auto!important}.p-lg-0{padding:0!important}.p-lg-1{padding:.25rem!important}.p-lg-2{padding:.5rem!important}.p-lg-3{padding:1rem!important}.p-lg-4{padding:1.5rem!important}.p-lg-5{padding:3rem!important}.px-lg-0{padding-right:0!important;padding-left:0!important}.px-lg-1{padding-right:.25rem!important;padding-left:.25rem!important}.px-lg-2{padding-right:.5rem!important;padding-left:.5rem!important}.px-lg-3{padding-right:1rem!important;padding-left:1rem!important}.px-lg-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.px-lg-5{padding-right:3rem!important;padding-left:3rem!important}.py-lg-0{padding-top:0!important;padding-bottom:0!important}.py-lg-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.py-lg-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.py-lg-3{padding-top:1rem!important;padding-bottom:1rem!important}.py-lg-4{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.py-lg-5{padding-top:3rem!important;padding-bottom:3rem!important}.pt-lg-0{padding-top:0!important}.pt-lg-1{padding-top:.25rem!important}.pt-lg-2{padding-top:.5rem!important}.pt-lg-3{padding-top:1rem!important}.pt-lg-4{padding-top:1.5rem!important}.pt-lg-5{padding-top:3rem!important}.pe-lg-0{padding-right:0!important}.pe-lg-1{padding-right:.25rem!important}.pe-lg-2{padding-right:.5rem!important}.pe-lg-3{padding-right:1rem!important}.pe-lg-4{padding-right:1.5rem!important}.pe-lg-5{padding-right:3rem!important}.pb-lg-0{padding-bottom:0!important}.pb-lg-1{padding-bottom:.25rem!important}.pb-lg-2{padding-bottom:.5rem!important}.pb-lg-3{padding-bottom:1rem!important}.pb-lg-4{padding-bottom:1.5rem!important}.pb-lg-5{padding-bottom:3rem!important}.ps-lg-0{padding-left:0!important}.ps-lg-1{padding-left:.25rem!important}.ps-lg-2{padding-left:.5rem!important}.ps-lg-3{padding-left:1rem!important}.ps-lg-4{padding-left:1.5rem!important}.ps-lg-5{padding-left:3rem!important}.gap-lg-0{gap:0!important}.gap-lg-1{gap:.25rem!important}.gap-lg-2{gap:.5rem!important}.gap-lg-3{gap:1rem!important}.gap-lg-4{gap:1.5rem!important}.gap-lg-5{gap:3rem!important}.row-gap-lg-0{row-gap:0!important}.row-gap-lg-1{row-gap:.25rem!important}.row-gap-lg-2{row-gap:.5rem!important}.row-gap-lg-3{row-gap:1rem!important}.row-gap-lg-4{row-gap:1.5rem!important}.row-gap-lg-5{row-gap:3rem!important}.column-gap-lg-0{-moz-column-gap:0!important;column-gap:0!important}.column-gap-lg-1{-moz-column-gap:0.25rem!important;column-gap:.25rem!important}.column-gap-lg-2{-moz-column-gap:0.5rem!important;column-gap:.5rem!important}.column-gap-lg-3{-moz-column-gap:1rem!important;column-gap:1rem!important}.column-gap-lg-4{-moz-column-gap:1.5rem!important;column-gap:1.5rem!important}.column-gap-lg-5{-moz-column-gap:3rem!important;column-gap:3rem!important}.text-lg-start{text-align:left!important}.text-lg-end{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.float-xl-start{float:left!important}.float-xl-end{float:right!important}.float-xl-none{float:none!important}.object-fit-xl-contain{-o-object-fit:contain!important;object-fit:contain!important}.object-fit-xl-cover{-o-object-fit:cover!important;object-fit:cover!important}.object-fit-xl-fill{-o-object-fit:fill!important;object-fit:fill!important}.object-fit-xl-scale{-o-object-fit:scale-down!important;object-fit:scale-down!important}.object-fit-xl-none{-o-object-fit:none!important;object-fit:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-grid{display:grid!important}.d-xl-inline-grid{display:inline-grid!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:flex!important}.d-xl-inline-flex{display:inline-flex!important}.d-xl-none{display:none!important}.flex-xl-fill{flex:1 1 auto!important}.flex-xl-row{flex-direction:row!important}.flex-xl-column{flex-direction:column!important}.flex-xl-row-reverse{flex-direction:row-reverse!important}.flex-xl-column-reverse{flex-direction:column-reverse!important}.flex-xl-grow-0{flex-grow:0!important}.flex-xl-grow-1{flex-grow:1!important}.flex-xl-shrink-0{flex-shrink:0!important}.flex-xl-shrink-1{flex-shrink:1!important}.flex-xl-wrap{flex-wrap:wrap!important}.flex-xl-nowrap{flex-wrap:nowrap!important}.flex-xl-wrap-reverse{flex-wrap:wrap-reverse!important}.justify-content-xl-start{justify-content:flex-start!important}.justify-content-xl-end{justify-content:flex-end!important}.justify-content-xl-center{justify-content:center!important}.justify-content-xl-between{justify-content:space-between!important}.justify-content-xl-around{justify-content:space-around!important}.justify-content-xl-evenly{justify-content:space-evenly!important}.align-items-xl-start{align-items:flex-start!important}.align-items-xl-end{align-items:flex-end!important}.align-items-xl-center{align-items:center!important}.align-items-xl-baseline{align-items:baseline!important}.align-items-xl-stretch{align-items:stretch!important}.align-content-xl-start{align-content:flex-start!important}.align-content-xl-end{align-content:flex-end!important}.align-content-xl-center{align-content:center!important}.align-content-xl-between{align-content:space-between!important}.align-content-xl-around{align-content:space-around!important}.align-content-xl-stretch{align-content:stretch!important}.align-self-xl-auto{align-self:auto!important}.align-self-xl-start{align-self:flex-start!important}.align-self-xl-end{align-self:flex-end!important}.align-self-xl-center{align-self:center!important}.align-self-xl-baseline{align-self:baseline!important}.align-self-xl-stretch{align-self:stretch!important}.order-xl-first{order:-1!important}.order-xl-0{order:0!important}.order-xl-1{order:1!important}.order-xl-2{order:2!important}.order-xl-3{order:3!important}.order-xl-4{order:4!important}.order-xl-5{order:5!important}.order-xl-last{order:6!important}.m-xl-0{margin:0!important}.m-xl-1{margin:.25rem!important}.m-xl-2{margin:.5rem!important}.m-xl-3{margin:1rem!important}.m-xl-4{margin:1.5rem!important}.m-xl-5{margin:3rem!important}.m-xl-auto{margin:auto!important}.mx-xl-0{margin-right:0!important;margin-left:0!important}.mx-xl-1{margin-right:.25rem!important;margin-left:.25rem!important}.mx-xl-2{margin-right:.5rem!important;margin-left:.5rem!important}.mx-xl-3{margin-right:1rem!important;margin-left:1rem!important}.mx-xl-4{margin-right:1.5rem!important;margin-left:1.5rem!important}.mx-xl-5{margin-right:3rem!important;margin-left:3rem!important}.mx-xl-auto{margin-right:auto!important;margin-left:auto!important}.my-xl-0{margin-top:0!important;margin-bottom:0!important}.my-xl-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.my-xl-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.my-xl-3{margin-top:1rem!important;margin-bottom:1rem!important}.my-xl-4{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.my-xl-5{margin-top:3rem!important;margin-bottom:3rem!important}.my-xl-auto{margin-top:auto!important;margin-bottom:auto!important}.mt-xl-0{margin-top:0!important}.mt-xl-1{margin-top:.25rem!important}.mt-xl-2{margin-top:.5rem!important}.mt-xl-3{margin-top:1rem!important}.mt-xl-4{margin-top:1.5rem!important}.mt-xl-5{margin-top:3rem!important}.mt-xl-auto{margin-top:auto!important}.me-xl-0{margin-right:0!important}.me-xl-1{margin-right:.25rem!important}.me-xl-2{margin-right:.5rem!important}.me-xl-3{margin-right:1rem!important}.me-xl-4{margin-right:1.5rem!important}.me-xl-5{margin-right:3rem!important}.me-xl-auto{margin-right:auto!important}.mb-xl-0{margin-bottom:0!important}.mb-xl-1{margin-bottom:.25rem!important}.mb-xl-2{margin-bottom:.5rem!important}.mb-xl-3{margin-bottom:1rem!important}.mb-xl-4{margin-bottom:1.5rem!important}.mb-xl-5{margin-bottom:3rem!important}.mb-xl-auto{margin-bottom:auto!important}.ms-xl-0{margin-left:0!important}.ms-xl-1{margin-left:.25rem!important}.ms-xl-2{margin-left:.5rem!important}.ms-xl-3{margin-left:1rem!important}.ms-xl-4{margin-left:1.5rem!important}.ms-xl-5{margin-left:3rem!important}.ms-xl-auto{margin-left:auto!important}.p-xl-0{padding:0!important}.p-xl-1{padding:.25rem!important}.p-xl-2{padding:.5rem!important}.p-xl-3{padding:1rem!important}.p-xl-4{padding:1.5rem!important}.p-xl-5{padding:3rem!important}.px-xl-0{padding-right:0!important;padding-left:0!important}.px-xl-1{padding-right:.25rem!important;padding-left:.25rem!important}.px-xl-2{padding-right:.5rem!important;padding-left:.5rem!important}.px-xl-3{padding-right:1rem!important;padding-left:1rem!important}.px-xl-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.px-xl-5{padding-right:3rem!important;padding-left:3rem!important}.py-xl-0{padding-top:0!important;padding-bottom:0!important}.py-xl-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.py-xl-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.py-xl-3{padding-top:1rem!important;padding-bottom:1rem!important}.py-xl-4{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.py-xl-5{padding-top:3rem!important;padding-bottom:3rem!important}.pt-xl-0{padding-top:0!important}.pt-xl-1{padding-top:.25rem!important}.pt-xl-2{padding-top:.5rem!important}.pt-xl-3{padding-top:1rem!important}.pt-xl-4{padding-top:1.5rem!important}.pt-xl-5{padding-top:3rem!important}.pe-xl-0{padding-right:0!important}.pe-xl-1{padding-right:.25rem!important}.pe-xl-2{padding-right:.5rem!important}.pe-xl-3{padding-right:1rem!important}.pe-xl-4{padding-right:1.5rem!important}.pe-xl-5{padding-right:3rem!important}.pb-xl-0{padding-bottom:0!important}.pb-xl-1{padding-bottom:.25rem!important}.pb-xl-2{padding-bottom:.5rem!important}.pb-xl-3{padding-bottom:1rem!important}.pb-xl-4{padding-bottom:1.5rem!important}.pb-xl-5{padding-bottom:3rem!important}.ps-xl-0{padding-left:0!important}.ps-xl-1{padding-left:.25rem!important}.ps-xl-2{padding-left:.5rem!important}.ps-xl-3{padding-left:1rem!important}.ps-xl-4{padding-left:1.5rem!important}.ps-xl-5{padding-left:3rem!important}.gap-xl-0{gap:0!important}.gap-xl-1{gap:.25rem!important}.gap-xl-2{gap:.5rem!important}.gap-xl-3{gap:1rem!important}.gap-xl-4{gap:1.5rem!important}.gap-xl-5{gap:3rem!important}.row-gap-xl-0{row-gap:0!important}.row-gap-xl-1{row-gap:.25rem!important}.row-gap-xl-2{row-gap:.5rem!important}.row-gap-xl-3{row-gap:1rem!important}.row-gap-xl-4{row-gap:1.5rem!important}.row-gap-xl-5{row-gap:3rem!important}.column-gap-xl-0{-moz-column-gap:0!important;column-gap:0!important}.column-gap-xl-1{-moz-column-gap:0.25rem!important;column-gap:.25rem!important}.column-gap-xl-2{-moz-column-gap:0.5rem!important;column-gap:.5rem!important}.column-gap-xl-3{-moz-column-gap:1rem!important;column-gap:1rem!important}.column-gap-xl-4{-moz-column-gap:1.5rem!important;column-gap:1.5rem!important}.column-gap-xl-5{-moz-column-gap:3rem!important;column-gap:3rem!important}.text-xl-start{text-align:left!important}.text-xl-end{text-align:right!important}.text-xl-center{text-align:center!important}}@media (min-width:1400px){.float-xxl-start{float:left!important}.float-xxl-end{float:right!important}.float-xxl-none{float:none!important}.object-fit-xxl-contain{-o-object-fit:contain!important;object-fit:contain!important}.object-fit-xxl-cover{-o-object-fit:cover!important;object-fit:cover!important}.object-fit-xxl-fill{-o-object-fit:fill!important;object-fit:fill!important}.object-fit-xxl-scale{-o-object-fit:scale-down!important;object-fit:scale-down!important}.object-fit-xxl-none{-o-object-fit:none!important;object-fit:none!important}.d-xxl-inline{display:inline!important}.d-xxl-inline-block{display:inline-block!important}.d-xxl-block{display:block!important}.d-xxl-grid{display:grid!important}.d-xxl-inline-grid{display:inline-grid!important}.d-xxl-table{display:table!important}.d-xxl-table-row{display:table-row!important}.d-xxl-table-cell{display:table-cell!important}.d-xxl-flex{display:flex!important}.d-xxl-inline-flex{display:inline-flex!important}.d-xxl-none{display:none!important}.flex-xxl-fill{flex:1 1 auto!important}.flex-xxl-row{flex-direction:row!important}.flex-xxl-column{flex-direction:column!important}.flex-xxl-row-reverse{flex-direction:row-reverse!important}.flex-xxl-column-reverse{flex-direction:column-reverse!important}.flex-xxl-grow-0{flex-grow:0!important}.flex-xxl-grow-1{flex-grow:1!important}.flex-xxl-shrink-0{flex-shrink:0!important}.flex-xxl-shrink-1{flex-shrink:1!important}.flex-xxl-wrap{flex-wrap:wrap!important}.flex-xxl-nowrap{flex-wrap:nowrap!important}.flex-xxl-wrap-reverse{flex-wrap:wrap-reverse!important}.justify-content-xxl-start{justify-content:flex-start!important}.justify-content-xxl-end{justify-content:flex-end!important}.justify-content-xxl-center{justify-content:center!important}.justify-content-xxl-between{justify-content:space-between!important}.justify-content-xxl-around{justify-content:space-around!important}.justify-content-xxl-evenly{justify-content:space-evenly!important}.align-items-xxl-start{align-items:flex-start!important}.align-items-xxl-end{align-items:flex-end!important}.align-items-xxl-center{align-items:center!important}.align-items-xxl-baseline{align-items:baseline!important}.align-items-xxl-stretch{align-items:stretch!important}.align-content-xxl-start{align-content:flex-start!important}.align-content-xxl-end{align-content:flex-end!important}.align-content-xxl-center{align-content:center!important}.align-content-xxl-between{align-content:space-between!important}.align-content-xxl-around{align-content:space-around!important}.align-content-xxl-stretch{align-content:stretch!important}.align-self-xxl-auto{align-self:auto!important}.align-self-xxl-start{align-self:flex-start!important}.align-self-xxl-end{align-self:flex-end!important}.align-self-xxl-center{align-self:center!important}.align-self-xxl-baseline{align-self:baseline!important}.align-self-xxl-stretch{align-self:stretch!important}.order-xxl-first{order:-1!important}.order-xxl-0{order:0!important}.order-xxl-1{order:1!important}.order-xxl-2{order:2!important}.order-xxl-3{order:3!important}.order-xxl-4{order:4!important}.order-xxl-5{order:5!important}.order-xxl-last{order:6!important}.m-xxl-0{margin:0!important}.m-xxl-1{margin:.25rem!important}.m-xxl-2{margin:.5rem!important}.m-xxl-3{margin:1rem!important}.m-xxl-4{margin:1.5rem!important}.m-xxl-5{margin:3rem!important}.m-xxl-auto{margin:auto!important}.mx-xxl-0{margin-right:0!important;margin-left:0!important}.mx-xxl-1{margin-right:.25rem!important;margin-left:.25rem!important}.mx-xxl-2{margin-right:.5rem!important;margin-left:.5rem!important}.mx-xxl-3{margin-right:1rem!important;margin-left:1rem!important}.mx-xxl-4{margin-right:1.5rem!important;margin-left:1.5rem!important}.mx-xxl-5{margin-right:3rem!important;margin-left:3rem!important}.mx-xxl-auto{margin-right:auto!important;margin-left:auto!important}.my-xxl-0{margin-top:0!important;margin-bottom:0!important}.my-xxl-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.my-xxl-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.my-xxl-3{margin-top:1rem!important;margin-bottom:1rem!important}.my-xxl-4{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.my-xxl-5{margin-top:3rem!important;margin-bottom:3rem!important}.my-xxl-auto{margin-top:auto!important;margin-bottom:auto!important}.mt-xxl-0{margin-top:0!important}.mt-xxl-1{margin-top:.25rem!important}.mt-xxl-2{margin-top:.5rem!important}.mt-xxl-3{margin-top:1rem!important}.mt-xxl-4{margin-top:1.5rem!important}.mt-xxl-5{margin-top:3rem!important}.mt-xxl-auto{margin-top:auto!important}.me-xxl-0{margin-right:0!important}.me-xxl-1{margin-right:.25rem!important}.me-xxl-2{margin-right:.5rem!important}.me-xxl-3{margin-right:1rem!important}.me-xxl-4{margin-right:1.5rem!important}.me-xxl-5{margin-right:3rem!important}.me-xxl-auto{margin-right:auto!important}.mb-xxl-0{margin-bottom:0!important}.mb-xxl-1{margin-bottom:.25rem!important}.mb-xxl-2{margin-bottom:.5rem!important}.mb-xxl-3{margin-bottom:1rem!important}.mb-xxl-4{margin-bottom:1.5rem!important}.mb-xxl-5{margin-bottom:3rem!important}.mb-xxl-auto{margin-bottom:auto!important}.ms-xxl-0{margin-left:0!important}.ms-xxl-1{margin-left:.25rem!important}.ms-xxl-2{margin-left:.5rem!important}.ms-xxl-3{margin-left:1rem!important}.ms-xxl-4{margin-left:1.5rem!important}.ms-xxl-5{margin-left:3rem!important}.ms-xxl-auto{margin-left:auto!important}.p-xxl-0{padding:0!important}.p-xxl-1{padding:.25rem!important}.p-xxl-2{padding:.5rem!important}.p-xxl-3{padding:1rem!important}.p-xxl-4{padding:1.5rem!important}.p-xxl-5{padding:3rem!important}.px-xxl-0{padding-right:0!important;padding-left:0!important}.px-xxl-1{padding-right:.25rem!important;padding-left:.25rem!important}.px-xxl-2{padding-right:.5rem!important;padding-left:.5rem!important}.px-xxl-3{padding-right:1rem!important;padding-left:1rem!important}.px-xxl-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.px-xxl-5{padding-right:3rem!important;padding-left:3rem!important}.py-xxl-0{padding-top:0!important;padding-bottom:0!important}.py-xxl-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.py-xxl-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.py-xxl-3{padding-top:1rem!important;padding-bottom:1rem!important}.py-xxl-4{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.py-xxl-5{padding-top:3rem!important;padding-bottom:3rem!important}.pt-xxl-0{padding-top:0!important}.pt-xxl-1{padding-top:.25rem!important}.pt-xxl-2{padding-top:.5rem!important}.pt-xxl-3{padding-top:1rem!important}.pt-xxl-4{padding-top:1.5rem!important}.pt-xxl-5{padding-top:3rem!important}.pe-xxl-0{padding-right:0!important}.pe-xxl-1{padding-right:.25rem!important}.pe-xxl-2{padding-right:.5rem!important}.pe-xxl-3{padding-right:1rem!important}.pe-xxl-4{padding-right:1.5rem!important}.pe-xxl-5{padding-right:3rem!important}.pb-xxl-0{padding-bottom:0!important}.pb-xxl-1{padding-bottom:.25rem!important}.pb-xxl-2{padding-bottom:.5rem!important}.pb-xxl-3{padding-bottom:1rem!important}.pb-xxl-4{padding-bottom:1.5rem!important}.pb-xxl-5{padding-bottom:3rem!important}.ps-xxl-0{padding-left:0!important}.ps-xxl-1{padding-left:.25rem!important}.ps-xxl-2{padding-left:.5rem!important}.ps-xxl-3{padding-left:1rem!important}.ps-xxl-4{padding-left:1.5rem!important}.ps-xxl-5{padding-left:3rem!important}.gap-xxl-0{gap:0!important}.gap-xxl-1{gap:.25rem!important}.gap-xxl-2{gap:.5rem!important}.gap-xxl-3{gap:1rem!important}.gap-xxl-4{gap:1.5rem!important}.gap-xxl-5{gap:3rem!important}.row-gap-xxl-0{row-gap:0!important}.row-gap-xxl-1{row-gap:.25rem!important}.row-gap-xxl-2{row-gap:.5rem!important}.row-gap-xxl-3{row-gap:1rem!important}.row-gap-xxl-4{row-gap:1.5rem!important}.row-gap-xxl-5{row-gap:3rem!important}.column-gap-xxl-0{-moz-column-gap:0!important;column-gap:0!important}.column-gap-xxl-1{-moz-column-gap:0.25rem!important;column-gap:.25rem!important}.column-gap-xxl-2{-moz-column-gap:0.5rem!important;column-gap:.5rem!important}.column-gap-xxl-3{-moz-column-gap:1rem!important;column-gap:1rem!important}.column-gap-xxl-4{-moz-column-gap:1.5rem!important;column-gap:1.5rem!important}.column-gap-xxl-5{-moz-column-gap:3rem!important;column-gap:3rem!important}.text-xxl-start{text-align:left!important}.text-xxl-end{text-align:right!important}.text-xxl-center{text-align:center!important}}@media (min-width:1200px){.fs-1{font-size:2.5rem!important}.fs-2{font-size:2rem!important}.fs-3{font-size:1.75rem!important}.fs-4{font-size:1.5rem!important}}@media print{.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-grid{display:grid!important}.d-print-inline-grid{display:inline-grid!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:flex!important}.d-print-inline-flex{display:inline-flex!important}.d-print-none{display:none!important}} -/*# sourceMappingURL=bootstrap.min.css.map */ \ No newline at end of file diff --git a/src/main/resources/webui/index.html b/src/main/resources/webui/index.html deleted file mode 100644 index 6f88e835..00000000 --- a/src/main/resources/webui/index.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - MarumaSign-WebUI - - - - - - - - - -
-
-

MarumaSign-WebUI

-
- -
- -
-
- - - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- プレビュー画像 -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
- - - \ No newline at end of file diff --git a/src/main/resources/webui/preview.js b/src/main/resources/webui/preview.js deleted file mode 100644 index 48d7eed3..00000000 --- a/src/main/resources/webui/preview.js +++ /dev/null @@ -1,23 +0,0 @@ -// URLが変更されたときにリソースを置き換えする -function detectChangeURL() { - console.log('URL Change Detected'); - - // HTMLElement取得 - const imgelem = document.getElementById('previewimg'); - const urlinput = document.getElementById("address"); - - // initエラーチェック - if (imgelem == null || urlinput == null || urlinput.value == undefined || imgelem.src == undefined) { - console.error('Cannnot get HTMLElement') - return; - } - - const imgurl = urlinput.value; - imgelem.src = imgurl; - - // 読み込み正常完了 - imgelem.onload = () => console.log(`Loaded image: ${imgurl}`); - - // 読み込み異常終了 - imgelem.onerror = () => console.error(`Cannnot get Image: ${imgurl}`); -} diff --git a/src/main/resources/webui/sanitize.css b/src/main/resources/webui/sanitize.css deleted file mode 100644 index 58cf3c16..00000000 --- a/src/main/resources/webui/sanitize.css +++ /dev/null @@ -1,363 +0,0 @@ -/* Document - * ========================================================================== */ - -/** - * 1. Add border box sizing in all browsers (opinionated). - * 2. Backgrounds do not repeat by default (opinionated). - */ - -*, -::before, -::after { - box-sizing: border-box; /* 1 */ - background-repeat: no-repeat; /* 2 */ -} - -/** - * 1. Add text decoration inheritance in all browsers (opinionated). - * 2. Add vertical alignment inheritance in all browsers (opinionated). - */ - -::before, -::after { - text-decoration: inherit; /* 1 */ - vertical-align: inherit; /* 2 */ -} - -/** - * 1. Use the default cursor in all browsers (opinionated). - * 2. Change the line height in all browsers (opinionated). - * 3. Breaks words to prevent overflow in all browsers (opinionated). - * 4. Use a 4-space tab width in all browsers (opinionated). - * 5. Remove the grey highlight on links in iOS (opinionated). - * 6. Prevent adjustments of font size after orientation changes in iOS. - */ - -:where(:root) { - cursor: default; /* 1 */ - line-height: 1.5; /* 2 */ - overflow-wrap: break-word; /* 3 */ - -moz-tab-size: 4; /* 4 */ - tab-size: 4; /* 4 */ - -webkit-tap-highlight-color: transparent; /* 5 */ - -webkit-text-size-adjust: 100%; /* 6 */ -} - -/* Sections - * ========================================================================== */ - -/** - * Remove the margin in all browsers (opinionated). - */ - -:where(body) { - margin: 0; -} - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Edge, Firefox, and Safari. - */ - -:where(h1) { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - * ========================================================================== */ - -/** - * Remove the margin on nested lists in Chrome, Edge, and Safari. - */ - -:where(dl, ol, ul) :where(dl, ol, ul) { - margin: 0; -} - -/** - * 1. Correct the inheritance of border color in Firefox. - * 2. Add the correct box sizing in Firefox. - */ - -:where(hr) { - color: inherit; /* 1 */ - height: 0; /* 2 */ -} - -/** - * Remove the list style on navigation lists in all browsers (opinionated). - */ - -:where(nav) :where(ol, ul) { - list-style-type: none; - padding: 0; -} - -/** - * Prevent VoiceOver from ignoring list semantics in Safari (opinionated). - */ - -:where(nav li)::before { - content: "\200B"; - float: left; -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - * 3. Prevent overflow of the container in all browsers (opinionated). - */ - -:where(pre) { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ - overflow: auto; /* 3 */ -} - -/* Text-level semantics - * ========================================================================== */ - -/** - * Add the correct text decoration in Safari. - */ - -:where(abbr[title]) { - text-decoration: underline; - text-decoration: underline dotted; -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -:where(b, strong) { - font-weight: bolder; -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -:where(code, kbd, samp) { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct font size in all browsers. - */ - -:where(small) { - font-size: 80%; -} - -/* Embedded content - * ========================================================================== */ - -/* - * Change the alignment on media elements in all browsers (opinionated). - */ - -:where(audio, canvas, iframe, img, svg, video) { - vertical-align: middle; -} - -/** - * Remove the border on iframes in all browsers (opinionated). - */ - -:where(iframe) { - border-style: none; -} - -/** - * Change the fill color to match the text color in all browsers (opinionated). - */ - -:where(svg:not([fill])) { - fill: currentColor; -} - -/* Tabular data - * ========================================================================== */ - -/** - * 1. Collapse border spacing in all browsers (opinionated). - * 2. Correct table border color inheritance in all Chrome, Edge, and Safari. - * 3. Remove text indentation from table contents in Chrome, Edge, and Safari. - */ - -:where(table) { - border-collapse: collapse; /* 1 */ - border-color: inherit; /* 2 */ - text-indent: 0; /* 3 */ -} - -/* Forms - * ========================================================================== */ - -/** - * Remove the margin on controls in Safari. - */ - -:where(button, input, select) { - margin: 0; -} - -/** - * Correct the inability to style buttons in iOS and Safari. - */ - -:where(button, [type="button" i], [type="reset" i], [type="submit" i]) { - -webkit-appearance: button; -} - -/** - * Change the inconsistent appearance in all browsers (opinionated). - */ - -:where(fieldset) { - border: 1px solid #a0a0a0; -} - -/** - * Add the correct vertical alignment in Chrome, Edge, and Firefox. - */ - -:where(progress) { - vertical-align: baseline; -} - -/** - * 1. Remove the margin in Firefox and Safari. - * 3. Change the resize direction in all browsers (opinionated). - */ - -:where(textarea) { - margin: 0; /* 1 */ - resize: vertical; /* 3 */ -} - -/** - * 1. Correct the odd appearance in Chrome, Edge, and Safari. - * 2. Correct the outline style in Safari. - */ - -:where([type="search" i]) { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Safari. - */ - -::-webkit-inner-spin-button, -::-webkit-outer-spin-button { - height: auto; -} - -/** - * Correct the text style of placeholders in Chrome, Edge, and Safari. - */ - -::-webkit-input-placeholder { - color: inherit; - opacity: 0.54; -} - -/** - * Remove the inner padding in Chrome, Edge, and Safari on macOS. - */ - -::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style upload buttons in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - * ========================================================================== */ - -/* - * Add the correct styles in Safari. - */ - -:where(dialog) { - background-color: white; - border: solid; - color: black; - height: -moz-fit-content; - height: fit-content; - left: 0; - margin: auto; - padding: 1em; - position: absolute; - right: 0; - width: -moz-fit-content; - width: fit-content; -} - -:where(dialog:not([open])) { - display: none; -} - -/* - * Add the correct display in Safari. - */ - -:where(details > summary:first-of-type) { - display: list-item; -} - -/* Accessibility - * ========================================================================== */ - -/** - * Change the cursor on busy elements in all browsers (opinionated). - */ - -:where([aria-busy="true" i]) { - cursor: progress; -} - -/* - * Change the cursor on control elements in all browsers (opinionated). - */ - -:where([aria-controls]) { - cursor: pointer; -} - -/* - * Change the cursor on disabled, not-editable, or otherwise - * inoperable elements in all browsers (opinionated). - */ - -:where([aria-disabled="true" i], [disabled]) { - cursor: not-allowed; -} - -/* - * Change the display on visually hidden accessible elements - * in all browsers (opinionated). - */ - -:where([aria-hidden="false" i][hidden]) { - display: initial; -} - -:where([aria-hidden="false" i][hidden]:not(:focus)) { - clip: rect(0, 0, 0, 0); - position: absolute; -} diff --git a/src/main/resources/webui/sans.css b/src/main/resources/webui/sans.css deleted file mode 100644 index 7d9b4b8c..00000000 --- a/src/main/resources/webui/sans.css +++ /dev/null @@ -1,1992 +0,0 @@ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.0.woff2) format('woff2'); - unicode-range: U+25ee8, U+25f23, U+25f5c, U+25fd4, U+25fe0, U+25ffb, U+2600c, U+26017, U+26060, U+260ed, U+26222, U+2626a, U+26270, U+26286, U+2634c, U+26402, U+2667e, U+266b0, U+2671d, U+268dd, U+268ea, U+26951, U+2696f, U+26999, U+269dd, U+26a1e, U+26a58, U+26a8c, U+26ab7, U+26aff, U+26c29, U+26c73, U+26c9e, U+26cdd, U+26e40, U+26e65, U+26f94, U+26ff6-26ff8, U+270f4, U+2710d, U+27139, U+273da-273db, U+273fe, U+27410, U+27449, U+27614-27615, U+27631, U+27684, U+27693, U+2770e, U+27723, U+27752, U+278b2, U+27985, U+279b4, U+27a84, U+27bb3, U+27bbe, U+27bc7, U+27c3c, U+27cb8, U+27d73, U+27da0, U+27e10, U+27eaf, U+27fb7, U+2808a, U+280bb, U+28277, U+28282, U+282f3, U+283cd, U+2840c, U+28455, U+284dc, U+2856b, U+285c8-285c9, U+286d7, U+286fa, U+28946, U+28949, U+2896b, U+28987-28988, U+289ba-289bb, U+28a1e, U+28a29, U+28a43, U+28a71, U+28a99, U+28acd, U+28add, U+28ae4, U+28bc1, U+28bef, U+28cdd, U+28d10, U+28d71, U+28dfb, U+28e0f, U+28e17, U+28e1f, U+28e36, U+28e89, U+28eeb, U+28ef6, U+28f32, U+28ff8, U+292a0, U+292b1, U+29490, U+295cf, U+2967f, U+296f0, U+29719, U+29750, U+29810, U+298c6, U+29a72, U+29d4b, U+29ddb, U+29e15, U+29e3d, U+29e49, U+29e8a, U+29ec4, U+29edb, U+29ee9, U+29fce, U+29fd7, U+2a01a, U+2a02f, U+2a082, U+2a0f9, U+2a190, U+2a2b2, U+2a38c, U+2a437, U+2a5f1, U+2a602, U+2a61a, U+2a6b2, U+2a9e6, U+2b746, U+2b751, U+2b753, U+2b75a, U+2b75c, U+2b765, U+2b776-2b777, U+2b77c, U+2b782, U+2b789, U+2b78b, U+2b78e, U+2b794, U+2b7ac, U+2b7af, U+2b7bd, U+2b7c9, U+2b7cf, U+2b7d2, U+2b7d8, U+2b7f0, U+2b80d, U+2b817, U+2b81a, U+2d544, U+2e278, U+2e569, U+2e6ea, U+2f804, U+2f80f, U+2f815, U+2f818, U+2f81a, U+2f822, U+2f828, U+2f82c, U+2f833, U+2f83f, U+2f846, U+2f852, U+2f862, U+2f86d, U+2f873, U+2f877, U+2f884, U+2f899-2f89a, U+2f8a6, U+2f8ac, U+2f8b2, U+2f8b6, U+2f8d3, U+2f8db-2f8dc, U+2f8e1, U+2f8e5, U+2f8ea, U+2f8ed, U+2f8fc, U+2f903, U+2f90b, U+2f90f, U+2f91a, U+2f920-2f921, U+2f945, U+2f947, U+2f96c, U+2f995, U+2f9d0, U+2f9de-2f9df, U+2f9f4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.1.woff2) format('woff2'); - unicode-range: U+1f235-1f23b, U+1f240-1f248, U+1f250-1f251, U+2000b, U+20089-2008a, U+200a2, U+200a4, U+200b0, U+200f5, U+20158, U+201a2, U+20213, U+2032b, U+20371, U+20381, U+203f9, U+2044a, U+20509, U+2053f, U+205b1, U+205d6, U+20611, U+20628, U+206ec, U+2074f, U+207c8, U+20807, U+2083a, U+208b9, U+2090e, U+2097c, U+20984, U+2099d, U+20a64, U+20ad3, U+20b1d, U+20b9f, U+20bb7, U+20d45, U+20d58, U+20de1, U+20e64, U+20e6d, U+20e95, U+20f5f, U+21201, U+2123d, U+21255, U+21274, U+2127b, U+212d7, U+212e4, U+212fd, U+2131b, U+21336, U+21344, U+213c4, U+2146d-2146e, U+215d7, U+21647, U+216b4, U+21706, U+21742, U+218bd, U+219c3, U+21a1a, U+21c56, U+21d2d, U+21d45, U+21d62, U+21d78, U+21d92, U+21d9c, U+21da1, U+21db7, U+21de0, U+21e33-21e34, U+21f1e, U+21f76, U+21ffa, U+2217b, U+22218, U+2231e, U+223ad, U+22609, U+226f3, U+2285b, U+228ab, U+2298f, U+22ab8, U+22b46, U+22b4f-22b50, U+22ba6, U+22c1d, U+22c24, U+22de1, U+22e42, U+22feb, U+231b6, U+231c3-231c4, U+231f5, U+23372, U+233cc, U+233d0, U+233d2-233d3, U+233d5, U+233da, U+233df, U+233e4, U+233fe, U+2344a-2344b, U+23451, U+23465, U+234e4, U+2355a, U+23594, U+235c4, U+23638-2363a, U+23647, U+2370c, U+2371c, U+2373f, U+23763-23764, U+237e7, U+237f1, U+237ff, U+23824, U+2383d, U+23a98, U+23c7f, U+23cbe, U+23cfe, U+23d00, U+23d0e, U+23d40, U+23dd3, U+23df9-23dfa, U+23f7e, U+2404b, U+24096, U+24103, U+241c6, U+241fe, U+242ee, U+243bc, U+243d0, U+24629, U+246a5, U+247f1, U+24896, U+248e9, U+24a4d, U+24b56, U+24b6f, U+24c16, U+24d14, U+24e04, U+24e0e, U+24e37, U+24e6a, U+24e8b, U+24ff2, U+2504a, U+25055, U+25122, U+251a9, U+251cd, U+251e5, U+2521e, U+2524c, U+2542e, U+2548e, U+254d9, U+2550e, U+255a7, U+2567f, U+25771, U+257a9, U+257b4, U+25874, U+259c4, U+259cc, U+259d4, U+25ad7, U+25ae3-25ae4, U+25af1, U+25bb2, U+25c4b, U+25c64, U+25da1, U+25e2e, U+25e56, U+25e62, U+25e65, U+25ec2, U+25ed8; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.2.woff2) format('woff2'); - unicode-range: U+ffd7, U+ffda-ffdc, U+ffe0-ffe2, U+ffe4, U+ffe6, U+ffe8-ffee, U+1f100-1f10c, U+1f110-1f16c, U+1f170-1f1ac, U+1f200-1f202, U+1f210-1f234; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.3.woff2) format('woff2'); - unicode-range: U+fa10, U+fa12-fa6d, U+fb00-fb04, U+fe10-fe19, U+fe30-fe42, U+fe44-fe52, U+fe54-fe66, U+fe68-fe6b, U+ff02, U+ff04, U+ff07, U+ff51, U+ff5b, U+ff5d, U+ff5f-ff60, U+ff66, U+ff69, U+ff87, U+ffa1-ffbe, U+ffc2-ffc7, U+ffca-ffcf, U+ffd2-ffd6; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.4.woff2) format('woff2'); - unicode-range: U+f92d-f959, U+f95b-f9f2, U+f9f4-fa0b, U+fa0e-fa0f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.5.woff2) format('woff2'); - unicode-range: U+9e8b-9e8c, U+9e8e-9e8f, U+9e91-9e92, U+9e95-9e96, U+9e98, U+9e9b, U+9e9d-9e9e, U+9ea4-9ea5, U+9ea8-9eaa, U+9eac-9eb0, U+9eb3-9eb5, U+9eb8, U+9ebc-9ebf, U+9ec3, U+9ec6, U+9ec8, U+9ecb-9ecd, U+9ecf-9ed1, U+9ed4-9ed5, U+9ed8, U+9edb-9ee0, U+9ee4-9ee5, U+9ee7-9ee8, U+9eec-9ef2, U+9ef4-9ef9, U+9efb-9eff, U+9f02-9f03, U+9f07-9f09, U+9f0e-9f12, U+9f14-9f17, U+9f19-9f1b, U+9f1f-9f22, U+9f26, U+9f2a-9f2c, U+9f2f, U+9f31-9f32, U+9f34, U+9f37, U+9f39-9f3a, U+9f3c-9f3f, U+9f41, U+9f43-9f47, U+9f4a, U+9f4e-9f50, U+9f52-9f58, U+9f5a, U+9f5d-9f61, U+9f63, U+9f66-9f6a, U+9f6c-9f73, U+9f75-9f77, U+9f7a, U+9f7d, U+9f7f, U+9f8f-9f92, U+9f94-9f97, U+9f99, U+9f9c-9fa3, U+9fa5, U+9fb4, U+9fbc-9fc2, U+9fc4, U+9fc6, U+9fcc, U+f900-f92c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.6.woff2) format('woff2'); - unicode-range: U+9c3e, U+9c41, U+9c43-9c4a, U+9c4e-9c50, U+9c52-9c54, U+9c56, U+9c58, U+9c5a-9c61, U+9c63, U+9c65, U+9c67-9c6b, U+9c6d-9c6e, U+9c70, U+9c72, U+9c75-9c78, U+9c7a-9c7c, U+9ce6-9ce7, U+9ceb-9cec, U+9cf0, U+9cf2, U+9cf6-9cf7, U+9cf9, U+9d02-9d03, U+9d06-9d09, U+9d0b, U+9d0e, U+9d11-9d12, U+9d15, U+9d17-9d18, U+9d1b-9d1f, U+9d23, U+9d26, U+9d2a-9d2c, U+9d2f-9d30, U+9d32-9d34, U+9d3a, U+9d3c-9d3f, U+9d41-9d48, U+9d4a, U+9d50-9d54, U+9d59, U+9d5d-9d65, U+9d69-9d6c, U+9d6f-9d70, U+9d72-9d73, U+9d76-9d77, U+9d7a-9d7c, U+9d7e, U+9d83-9d84, U+9d86-9d87, U+9d89-9d8a, U+9d8d-9d8e, U+9d92-9d93, U+9d95-9d9a, U+9da1, U+9da4, U+9da9-9dac, U+9dae, U+9db1-9db2, U+9db5, U+9db8-9dbd, U+9dbf-9dc4, U+9dc6-9dc7, U+9dc9-9dca, U+9dcf, U+9dd3-9dd7, U+9dd9-9dda, U+9dde-9de0, U+9de3, U+9de5-9de7, U+9de9, U+9deb, U+9ded-9df0, U+9df3-9df4, U+9df8, U+9dfd-9dfe, U+9e02, U+9e07, U+9e0a, U+9e0d-9e0e, U+9e10-9e12, U+9e15-9e16, U+9e19-9e1f, U+9e75, U+9e79-9e7d, U+9e80-9e85, U+9e87-9e88; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.7.woff2) format('woff2'); - unicode-range: U+9ae5-9ae7, U+9ae9, U+9aeb-9aec, U+9aee-9aef, U+9af1-9af5, U+9af7, U+9af9-9afb, U+9afd, U+9aff-9b06, U+9b08-9b09, U+9b0b-9b0e, U+9b10, U+9b12, U+9b16, U+9b18-9b1d, U+9b1f-9b20, U+9b22-9b23, U+9b25-9b2f, U+9b32-9b35, U+9b37, U+9b39-9b3b, U+9b3d, U+9b43-9b44, U+9b48, U+9b4b-9b4f, U+9b51, U+9b55-9b58, U+9b5b, U+9b5e, U+9b61, U+9b63, U+9b65-9b66, U+9b68, U+9b6a-9b6f, U+9b72-9b79, U+9b7f-9b80, U+9b83-9b87, U+9b89-9b8b, U+9b8d, U+9b8f-9b94, U+9b96-9b97, U+9b9a, U+9b9d-9ba0, U+9ba6-9ba7, U+9ba9-9baa, U+9bac, U+9bb0-9bb2, U+9bb4, U+9bb7-9bb9, U+9bbb-9bbc, U+9bbe-9bc1, U+9bc6-9bc8, U+9bca, U+9bce-9bd2, U+9bd4, U+9bd7-9bd8, U+9bdd, U+9bdf, U+9be1-9be5, U+9be7, U+9bea-9beb, U+9bee-9bf3, U+9bf5, U+9bf7-9bfa, U+9bfd, U+9bff-9c00, U+9c02, U+9c04, U+9c06, U+9c08-9c0d, U+9c0f-9c16, U+9c18-9c1e, U+9c21-9c2a, U+9c2d-9c32, U+9c35-9c37, U+9c39-9c3a, U+9c3d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.8.woff2) format('woff2'); - unicode-range: U+98eb, U+98ed-98ee, U+98f0-98f1, U+98f3, U+98f6, U+9902, U+9907-9909, U+9911-9912, U+9914-9918, U+991a-9922, U+9924, U+9926-9927, U+992b-992c, U+992e, U+9931-9935, U+9939-993e, U+9940-9942, U+9945-9949, U+994b-994e, U+9950-9952, U+9954-9955, U+9958-9959, U+995b-995c, U+995e-9960, U+9963, U+9997-9998, U+999b, U+999d-999f, U+99a3, U+99a5-99a6, U+99a8, U+99ad-99ae, U+99b0-99b2, U+99b5, U+99b9-99ba, U+99bc-99bd, U+99bf, U+99c1, U+99c3, U+99c8-99c9, U+99d1, U+99d3-99d5, U+99d8-99df, U+99e1-99e2, U+99e7, U+99ea-99ee, U+99f0-99f2, U+99f4-99f5, U+99f8-99f9, U+99fb-99fe, U+9a01-9a05, U+9a08, U+9a0a-9a0c, U+9a0f-9a11, U+9a16, U+9a1a, U+9a1e, U+9a20, U+9a22-9a24, U+9a27, U+9a2b, U+9a2d-9a2e, U+9a31, U+9a33, U+9a35-9a38, U+9a3e, U+9a40-9a45, U+9a47, U+9a4a-9a4e, U+9a51-9a52, U+9a54-9a58, U+9a5b, U+9a5d, U+9a5f, U+9a62, U+9a64-9a65, U+9a69-9a6c, U+9aaa, U+9aac-9ab0, U+9ab2, U+9ab4-9ab7, U+9ab9, U+9abb-9ac1, U+9ac3, U+9ac6, U+9ac8, U+9ace-9ad3, U+9ad5-9ad7, U+9adb-9adc, U+9ade-9ae0, U+9ae2-9ae4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.9.woff2) format('woff2'); - unicode-range: U+971d, U+9721-9724, U+9728, U+972a, U+9730-9731, U+9733, U+9736, U+9738-9739, U+973b, U+973d-973e, U+9741-9744, U+9746-974a, U+974d-974f, U+9751, U+9755, U+9757-9758, U+975a-975c, U+9760-9761, U+9763-9764, U+9766-9768, U+976a-976b, U+976e, U+9771, U+9773, U+9776-977d, U+977f-9781, U+9785-9786, U+9789, U+978b, U+978f-9790, U+9795-9797, U+9799-979a, U+979c, U+979e-97a0, U+97a2-97a3, U+97a6, U+97a8, U+97ab-97ac, U+97ae, U+97b1-97b6, U+97b8-97ba, U+97bc, U+97be-97bf, U+97c1, U+97c3-97ce, U+97d0-97d1, U+97d4, U+97d7-97d9, U+97db-97de, U+97e0-97e1, U+97e4, U+97e6, U+97ed-97ef, U+97f1-97f2, U+97f4-97f8, U+97fa, U+9804, U+9807, U+980a, U+980c-980f, U+9814, U+9816-9817, U+9819-981a, U+981c, U+981e, U+9820-9821, U+9823-9826, U+982b, U+982e-9830, U+9832-9835, U+9837, U+9839, U+983d-983e, U+9844, U+9846-9847, U+984a-984b, U+984f, U+9851-9853, U+9856-9857, U+9859-985b, U+9862-9863, U+9865-9866, U+986a-986c, U+986f-9871, U+9873-9875, U+98aa-98ab, U+98ad-98ae, U+98b0-98b1, U+98b4, U+98b6-98b8, U+98ba-98bc, U+98bf, U+98c2-98c8, U+98cb-98cc, U+98ce, U+98dc, U+98de, U+98e0-98e1, U+98e3, U+98e5-98e7, U+98e9-98ea; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.10.woff2) format('woff2'); - unicode-range: U+944a, U+944c, U+9452-9453, U+9455, U+9459-945c, U+945e-9463, U+9468, U+946a-946b, U+946d-9472, U+9475, U+9477, U+947c-947f, U+9481, U+9483-9485, U+9578-9579, U+957e-957f, U+9582, U+9584, U+9586-9588, U+958a, U+958c-958f, U+9592, U+9594, U+9596, U+9598-9599, U+959d-95a1, U+95a4, U+95a6-95a9, U+95ab-95ad, U+95b1, U+95b4, U+95b6, U+95b9-95bf, U+95c3, U+95c6, U+95c8-95cd, U+95d0-95d6, U+95d9-95da, U+95dc-95e2, U+95e4-95e6, U+95e8, U+961d-961e, U+9621-9622, U+9624-9626, U+9628, U+962c, U+962e-962f, U+9631, U+9633-9634, U+9637-963a, U+963c-963d, U+9641-9642, U+964b-964c, U+964f, U+9652, U+9654, U+9656-9658, U+965c-965f, U+9661, U+9666, U+966a, U+966c, U+966e, U+9672, U+9674, U+9677, U+967b-967c, U+967e-967f, U+9681-9684, U+9689, U+968b, U+968d, U+9691, U+9695-9698, U+969a, U+969d, U+969f, U+96a4-96aa, U+96ae-96b4, U+96b6, U+96b8-96bb, U+96bd, U+96c1, U+96c9-96cb, U+96cd-96ce, U+96d2, U+96d5-96d6, U+96d8-96da, U+96dc-96df, U+96e9, U+96ef, U+96f1, U+96f9-96fa, U+9702-9706, U+9708-9709, U+970d-970f, U+9711, U+9713-9714, U+9716, U+9719-971b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.11.woff2) format('woff2'); - unicode-range: U+92bc-92bd, U+92bf-92c3, U+92c5-92c8, U+92cb-92d0, U+92d2-92d3, U+92d5, U+92d7-92d9, U+92dc-92dd, U+92df-92e1, U+92e3-92e5, U+92e7-92ea, U+92ec, U+92ee, U+92f0, U+92f2, U+92f7-92fb, U+92ff-9300, U+9302, U+9304, U+9308, U+930d, U+930f-9311, U+9314-9315, U+9318-931a, U+931c-931f, U+9321-9325, U+9327-932b, U+932e, U+9333-9337, U+933a-933b, U+9344, U+9347-934a, U+934d, U+9350-9352, U+9354-9358, U+935a, U+935c, U+935e, U+9360, U+9364-9365, U+9367, U+9369-936d, U+936f-9371, U+9373-9374, U+9376, U+937a, U+937d-9382, U+9388, U+938a-938b, U+938d, U+938f, U+9392, U+9394-9395, U+9397-9398, U+939a-939b, U+939e, U+93a1, U+93a3-93a4, U+93a6, U+93a8-93a9, U+93ab-93ad, U+93b0, U+93b4-93b6, U+93b9-93bb, U+93c1, U+93c3-93cd, U+93d0-93d1, U+93d3, U+93d6-93d9, U+93dc-93df, U+93e2, U+93e4-93e8, U+93f1, U+93f5, U+93f7-93fb, U+93fd, U+9401-9404, U+9407-9409, U+940d-9410, U+9413-9417, U+9419-941a, U+941f, U+9421, U+942b, U+942e-942f, U+9431-9434, U+9436, U+9438, U+943a-943b, U+943d, U+943f, U+9441, U+9443-9445, U+9448; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.12.woff2) format('woff2'); - unicode-range: U+9143, U+9146-914c, U+914f, U+9153, U+9156-915b, U+9161, U+9163-9165, U+9167, U+9169, U+916d, U+9172-9174, U+9179-917b, U+9181-9183, U+9185-9187, U+9189-918b, U+918e, U+9191, U+9193-9195, U+9197-9198, U+919e, U+91a1-91a2, U+91a6, U+91a8, U+91aa-91b6, U+91ba-91bd, U+91bf-91c6, U+91c9, U+91cb, U+91d0, U+91d3-91d4, U+91d6-91d7, U+91d9-91db, U+91de-91df, U+91e1, U+91e4-91e6, U+91e9-91ea, U+91ec-91f1, U+91f5-91f7, U+91f9, U+91fb-91fd, U+91ff-9201, U+9204-9207, U+9209-920a, U+920c, U+920e, U+9210-9218, U+921c-921e, U+9223-9226, U+9228-9229, U+922c, U+922e-9230, U+9233, U+9235-923a, U+923c, U+923e-9240, U+9242-9243, U+9245-924b, U+924d-9251, U+9256-925a, U+925c-925e, U+9260-9261, U+9264-9269, U+926e-9270, U+9275-9279, U+927b-927f, U+9288-928a, U+928d-928e, U+9291-9293, U+9295-9297, U+9299, U+929b-929c, U+929f-92a0, U+92a4-92a5, U+92a7-92a8, U+92ab, U+92af, U+92b2-92b3, U+92b6-92bb; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.13.woff2) format('woff2'); - unicode-range: U+8f52-8f55, U+8f57-8f58, U+8f5c-8f5e, U+8f61-8f66, U+8f9c-8f9d, U+8f9f-8fa2, U+8fa4-8fa8, U+8fad-8faf, U+8fb4-8fb8, U+8fbe, U+8fc0-8fc2, U+8fc6, U+8fc8, U+8fca-8fcb, U+8fcd, U+8fd0, U+8fd2-8fd3, U+8fd5, U+8fda, U+8fe0, U+8fe2-8fe5, U+8fe8-8fea, U+8fed-8fef, U+8ff1, U+8ff4-8ff6, U+8ff8-8ffb, U+8ffe, U+9002, U+9004-9005, U+9008, U+900b-900e, U+9011, U+9013, U+9015-9016, U+9018, U+901b, U+901e, U+9021, U+9027-902a, U+902c-902d, U+902f, U+9033-9037, U+9039, U+903c, U+903e-903f, U+9041, U+9043-9044, U+9049, U+904c, U+904f-9052, U+9056, U+9058, U+905b-905e, U+9062, U+9066-9068, U+906c, U+906f-9070, U+9072, U+9074, U+9076, U+9079, U+9080-9083, U+9085, U+9087-9088, U+908b-908c, U+908e-9090, U+9095, U+9097-9099, U+909b, U+90a0-90a2, U+90a5, U+90a8, U+90af-90b6, U+90bd-90be, U+90c3-90c5, U+90c7-90c9, U+90cc, U+90d2, U+90d5, U+90d7-90d9, U+90db-90df, U+90e2, U+90e4-90e5, U+90eb, U+90ef-90f0, U+90f2, U+90f4, U+90f6, U+90fe-9100, U+9102, U+9104-9106, U+9108, U+910d, U+9110, U+9112, U+9114-911a, U+911c, U+911e, U+9120, U+9122-9123, U+9125, U+9127, U+9129, U+912d-9132, U+9134, U+9136-9137, U+9139-913a, U+913c-913d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.14.woff2) format('woff2'); - unicode-range: U+8dc0, U+8dc2, U+8dc5-8dc8, U+8dca-8dcc, U+8dce-8dcf, U+8dd1, U+8dd4-8dd7, U+8dd9-8ddb, U+8ddf, U+8de3-8de5, U+8de7, U+8dea-8dec, U+8df0-8df2, U+8df4, U+8dfc-8dfd, U+8dff, U+8e01, U+8e04-8e06, U+8e08-8e09, U+8e0b-8e0c, U+8e10-8e11, U+8e14, U+8e16, U+8e1d-8e23, U+8e26-8e27, U+8e30-8e31, U+8e33-8e39, U+8e3d, U+8e40-8e42, U+8e44, U+8e47-8e50, U+8e54-8e55, U+8e59, U+8e5b-8e64, U+8e69, U+8e6c-8e6d, U+8e6f-8e72, U+8e75-8e77, U+8e79-8e7c, U+8e81-8e85, U+8e89, U+8e8b, U+8e90-8e95, U+8e98-8e9b, U+8e9d-8e9e, U+8ea1-8ea2, U+8ea7, U+8ea9-8eaa, U+8eac-8eb1, U+8eb3, U+8eb5-8eb6, U+8eba-8ebb, U+8ebe, U+8ec0-8ec1, U+8ec3-8ec8, U+8ecb, U+8ecf, U+8ed1, U+8ed4, U+8edb-8edc, U+8ee3, U+8ee8, U+8eeb, U+8eed-8eee, U+8ef0-8ef1, U+8ef7, U+8ef9-8efc, U+8efe, U+8f00, U+8f02, U+8f05, U+8f07-8f08, U+8f0a, U+8f0f-8f10, U+8f12-8f13, U+8f15-8f19, U+8f1b-8f1c, U+8f1e-8f21, U+8f23, U+8f25-8f28, U+8f2b-8f2f, U+8f33-8f37, U+8f39-8f3b, U+8f3e, U+8f40-8f43, U+8f45-8f47, U+8f49-8f4a, U+8f4c-8f4f, U+8f51; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.15.woff2) format('woff2'); - unicode-range: U+8b2d, U+8b30, U+8b37, U+8b3c, U+8b3e, U+8b41-8b46, U+8b48-8b49, U+8b4c-8b4f, U+8b51-8b54, U+8b56, U+8b59, U+8b5b, U+8b5e-8b5f, U+8b63, U+8b69, U+8b6b-8b6d, U+8b6f, U+8b71, U+8b74, U+8b76, U+8b78-8b79, U+8b7c-8b81, U+8b84-8b85, U+8b8a-8b8f, U+8b92-8b96, U+8b99-8b9a, U+8b9c-8ba0, U+8c38-8c3a, U+8c3d-8c3f, U+8c41, U+8c45, U+8c47-8c49, U+8c4b-8c4c, U+8c4e-8c51, U+8c53-8c55, U+8c57-8c59, U+8c5b, U+8c5d, U+8c62-8c64, U+8c66, U+8c68-8c69, U+8c6b-8c6d, U+8c73, U+8c75-8c76, U+8c78, U+8c7a-8c7c, U+8c7e, U+8c82, U+8c85-8c87, U+8c89-8c8b, U+8c8d-8c8e, U+8c90, U+8c92-8c94, U+8c98-8c99, U+8c9b-8c9c, U+8c9f, U+8ca4, U+8cad-8cae, U+8cb2-8cb3, U+8cb6, U+8cb9-8cba, U+8cbd, U+8cc1-8cc2, U+8cc4-8cc6, U+8cc8-8cc9, U+8ccb, U+8ccd-8ccf, U+8cd2, U+8cd5-8cd6, U+8cd9-8cda, U+8cdd, U+8ce1, U+8ce3-8ce4, U+8ce6, U+8ce8, U+8cec, U+8cef-8cf2, U+8cf4-8cf5, U+8cf7-8cf8, U+8cfa-8cfb, U+8cfd-8cff, U+8d01, U+8d03-8d04, U+8d07, U+8d09-8d0b, U+8d0d-8d10, U+8d12-8d14, U+8d16-8d17, U+8d1b-8d1d, U+8d65, U+8d67, U+8d69, U+8d6b-8d6e, U+8d71, U+8d73, U+8d76, U+8d7f, U+8d81-8d82, U+8d84, U+8d88, U+8d8d, U+8d90-8d91, U+8d95, U+8d99, U+8d9e-8da0, U+8da6, U+8da8, U+8dab-8dac, U+8daf, U+8db2, U+8db5, U+8db7, U+8db9-8dbc, U+8dbe; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.16.woff2) format('woff2'); - unicode-range: U+8973-8975, U+8977, U+897a-897e, U+8980, U+8983, U+8988-898a, U+898d, U+8990, U+8993-8995, U+8998, U+899b-899c, U+899f-89a1, U+89a5-89a6, U+89a9, U+89ac, U+89af-89b0, U+89b2, U+89b4-89b7, U+89ba, U+89bc-89bd, U+89bf-89c1, U+89d4-89d8, U+89da, U+89dc-89dd, U+89e5, U+89e7, U+89e9, U+89eb, U+89ed, U+89f1, U+89f3-89f4, U+89f6, U+89f8-89f9, U+89fd, U+89ff, U+8a01, U+8a04-8a05, U+8a07, U+8a0c, U+8a0f-8a12, U+8a14-8a16, U+8a1b, U+8a1d-8a1e, U+8a20-8a22, U+8a24-8a26, U+8a2b-8a2c, U+8a2f, U+8a35-8a37, U+8a3b, U+8a3d-8a3e, U+8a40-8a41, U+8a43, U+8a45-8a49, U+8a4d-8a4e, U+8a51-8a54, U+8a56-8a58, U+8a5b-8a5d, U+8a61-8a62, U+8a65, U+8a67, U+8a6c-8a6d, U+8a75-8a77, U+8a79-8a7c, U+8a7e-8a80, U+8a82-8a86, U+8a8b, U+8a8f-8a92, U+8a96-8a97, U+8a99-8a9a, U+8a9f, U+8aa1, U+8aa3, U+8aa5-8aaa, U+8aae-8aaf, U+8ab3, U+8ab6-8ab7, U+8abb-8abc, U+8abe, U+8ac2-8ac4, U+8ac6, U+8ac8-8aca, U+8acc-8acd, U+8ad0-8ad1, U+8ad3-8ad5, U+8ad7, U+8ada-8ae2, U+8ae4, U+8ae7, U+8aeb-8aec, U+8aee, U+8af0-8af1, U+8af3-8af7, U+8afa, U+8afc, U+8aff, U+8b01-8b02, U+8b04-8b07, U+8b0a-8b0d, U+8b0f-8b11, U+8b14, U+8b16, U+8b1a, U+8b1c, U+8b1e-8b20, U+8b26, U+8b28, U+8b2b-8b2c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.17.woff2) format('woff2'); - unicode-range: U+87e2-87e6, U+87ea-87ed, U+87ef, U+87f1, U+87f3, U+87f5-87f8, U+87fa-87fb, U+87fe-87ff, U+8801, U+8803, U+8805-8807, U+8809-880b, U+880d-8816, U+8818-881c, U+881e-881f, U+8821-8822, U+8827-8828, U+882d-882e, U+8830-8832, U+8835-8836, U+8839-883c, U+8841-8845, U+8848-884b, U+884d-884e, U+8851-8852, U+8855-8856, U+8858-885a, U+885c, U+885e-8860, U+8862, U+8864, U+8869, U+886b, U+886e-886f, U+8871-8872, U+8875, U+8877, U+8879, U+887b, U+887d-887e, U+8880-8882, U+8888, U+888d, U+8892, U+8897-889c, U+889e-88a0, U+88a2, U+88a4, U+88a8, U+88aa, U+88ae, U+88b0-88b1, U+88b5, U+88b7, U+88ba, U+88bc-88c0, U+88c3-88c4, U+88c6, U+88ca-88ce, U+88d1-88d4, U+88d8-88d9, U+88db, U+88dd-88e1, U+88e7-88e8, U+88ef-88f2, U+88f4-88f5, U+88f7, U+88f9, U+88fc, U+8901-8902, U+8904, U+8906, U+890a, U+890c-890f, U+8913, U+8915-8916, U+8918-891a, U+891c-891e, U+8920, U+8925-8928, U+892a-892b, U+8930-8932, U+8935-893b, U+893e, U+8940-8946, U+8949, U+894c-894d, U+894f, U+8952, U+8956-8957, U+895a-895c, U+895e, U+8960-8964, U+8966, U+896a-896b, U+896d-8970; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.18.woff2) format('woff2'); - unicode-range: U+8655-8659, U+865b, U+865d-8664, U+8667, U+8669, U+866c, U+866f, U+8671, U+8675-8677, U+867a-867b, U+867d, U+8687-8689, U+868b-868d, U+8691, U+8693, U+8695-8696, U+8698, U+869a, U+869c-869d, U+86a1, U+86a3-86a4, U+86a6-86ab, U+86ad, U+86af-86b1, U+86b3-86b9, U+86bf-86c1, U+86c3-86c6, U+86c9, U+86cb, U+86ce, U+86d1-86d2, U+86d4-86d5, U+86d7, U+86da, U+86dc, U+86de-86e0, U+86e3-86e7, U+86e9, U+86ec-86ed, U+86ef, U+86f8-86fe, U+8700, U+8703-870b, U+870d-8714, U+8719-871a, U+871e-871f, U+8721-8723, U+8725, U+8728-8729, U+872e-872f, U+8731-8732, U+8734, U+8737, U+8739-8740, U+8743, U+8745, U+8749, U+874b-874e, U+8751, U+8753, U+8755, U+8757-8759, U+875d, U+875f-8761, U+8763-8766, U+8768, U+876a, U+876e-876f, U+8771-8772, U+8774, U+8778, U+877b-877c, U+877f, U+8782-8789, U+878b-878c, U+878e, U+8790, U+8793, U+8795, U+8797-8799, U+879e-87a0, U+87a2-87a3, U+87a7, U+87ab-87af, U+87b1, U+87b3, U+87b5, U+87bb, U+87bd-87c1, U+87c4, U+87c6-87cb, U+87ce, U+87d0, U+87d2, U+87d5-87d6, U+87d9-87da, U+87dc, U+87df-87e0; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.19.woff2) format('woff2'); - unicode-range: U+84b4, U+84b9-84bb, U+84bd-84c2, U+84c6-84ca, U+84cc-84d1, U+84d3, U+84d6, U+84d9-84da, U+84dc, U+84e7, U+84ea, U+84ec, U+84ef-84f2, U+84f4, U+84f7, U+84fa-84fd, U+84ff-8500, U+8502-8503, U+8506-8507, U+850c, U+850e, U+8510, U+8514-8515, U+8517-8518, U+851a-851c, U+851e-851f, U+8521-8525, U+8527, U+852a-852c, U+852f, U+8532-8534, U+8536, U+853e-8541, U+8543, U+8546, U+8548, U+854a-854b, U+854f-8553, U+8555-855a, U+855c-8564, U+8569-856b, U+856d, U+856f, U+8577, U+8579-857b, U+857d-8581, U+8585-8586, U+8588-858c, U+858f-8591, U+8593, U+8597-8598, U+859b-859d, U+859f-85a0, U+85a2, U+85a4-85a5, U+85a7-85a8, U+85ad-85b0, U+85b4, U+85b6-85ba, U+85bc-85bf, U+85c1-85c2, U+85c7, U+85c9-85cb, U+85ce-85d0, U+85d5, U+85d8-85da, U+85dc, U+85df-85e1, U+85e5-85e6, U+85e8, U+85ed, U+85f3-85f4, U+85f6-85f7, U+85f9-85fa, U+85fc, U+85fe-8600, U+8602, U+8604-8606, U+860a-860b, U+860d-860e, U+8610-8613, U+8616-861b, U+861e, U+8621-8622, U+8624, U+8627, U+8629, U+862f-8630, U+8636, U+8638-863a, U+863c-863d, U+863f-8642, U+8646, U+864d, U+8652-8654; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.20.woff2) format('woff2'); - unicode-range: U+82e8, U+82ea, U+82ed, U+82ef, U+82f3-82f4, U+82f6-82f7, U+82f9, U+82fb, U+82fd-82fe, U+8300-8301, U+8303, U+8306-8308, U+830a-830c, U+8316-8318, U+831b, U+831d-831f, U+8321-8323, U+832b-8335, U+8337, U+833a, U+833c-833d, U+8340, U+8342-8347, U+834a, U+834d-8351, U+8353-8357, U+835a, U+8362-8363, U+8370, U+8373, U+8375, U+8378, U+837c-837d, U+837f-8380, U+8382, U+8384-8387, U+838a, U+838d-838e, U+8392-8396, U+8398-83a0, U+83a2, U+83a6-83ad, U+83b1, U+83b5, U+83bd-83c1, U+83c7, U+83c9, U+83ce-83d1, U+83d4, U+83d6, U+83d8, U+83dd, U+83df-83e1, U+83e5, U+83e8, U+83ea-83eb, U+83f0, U+83f2, U+83f4, U+83f6-83f9, U+83fb-83fd, U+8401, U+8403-8404, U+8406-8407, U+840a-840b, U+840d, U+840f, U+8411, U+8413, U+8415, U+8417, U+8419, U+8420, U+8422, U+842a, U+842f, U+8431, U+8435, U+8438-8439, U+843c, U+8445-8448, U+844a, U+844d-844f, U+8451-8452, U+8456, U+8458-845a, U+845c, U+845f-8462, U+8464-8467, U+8469-846b, U+846d-8470, U+8473-8474, U+8476-847a, U+847c-847d, U+8481-8482, U+8484-8485, U+848b, U+8490, U+8492-8493, U+8495, U+8497, U+849c, U+849e-849f, U+84a1, U+84a6, U+84a8-84aa, U+84ad, U+84af, U+84b1; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.21.woff2) format('woff2'); - unicode-range: U+814a, U+814c, U+8151-8153, U+8157, U+815f-8161, U+8165-8169, U+816d-816f, U+8171, U+8173-8174, U+8177, U+8180-8186, U+8188, U+818a-818b, U+818e, U+8190, U+8193, U+8195-8196, U+8198, U+819b, U+819e, U+81a0, U+81a2, U+81a4, U+81a9, U+81ae, U+81b0, U+81b2, U+81b4-81b5, U+81b8, U+81ba-81bb, U+81bd-81be, U+81c0-81c3, U+81c5-81c6, U+81c8-81cb, U+81cd-81cf, U+81d1, U+81d5-81db, U+81dd-81e1, U+81e4-81e5, U+81e7, U+81eb-81ec, U+81ef-81f2, U+81f5-81f6, U+81f8-81fb, U+81fd-8205, U+8209-820b, U+820d, U+820f, U+8212-8214, U+8216, U+8219-821d, U+8221-8222, U+8228-8229, U+822b, U+822e, U+8232-8235, U+8237-8238, U+823a, U+823c, U+8240, U+8243-8246, U+8249, U+824b, U+824e-824f, U+8251, U+8256-825a, U+825c-825d, U+825f-8260, U+8262-8264, U+8267-8268, U+826a-826b, U+826d-826e, U+8271, U+8274, U+8277, U+8279, U+827b, U+827d-8281, U+8283-8284, U+8287, U+8289-828a, U+828d-828e, U+8291-8294, U+8296, U+8298-829b, U+829f-82a1, U+82a3-82a4, U+82a7-82ac, U+82ae, U+82b0, U+82b2, U+82b4, U+82b7, U+82ba-82bc, U+82be-82bf, U+82c5-82c6, U+82d0, U+82d2-82d3, U+82d5, U+82d9-82da, U+82dc, U+82de-82e4, U+82e7; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.22.woff2) format('woff2'); - unicode-range: U+7f77-7f79, U+7f7d-7f80, U+7f82-7f83, U+7f86-7f88, U+7f8b-7f8d, U+7f8f-7f91, U+7f94, U+7f96-7f97, U+7f9a, U+7f9c-7f9d, U+7fa1-7fa3, U+7fa6, U+7faa, U+7fad-7faf, U+7fb2, U+7fb4, U+7fb6, U+7fb8-7fb9, U+7fbc, U+7fbf-7fc0, U+7fc3, U+7fc5-7fc6, U+7fc8, U+7fca, U+7fce-7fcf, U+7fd5, U+7fdb, U+7fdf, U+7fe1, U+7fe3, U+7fe5-7fe6, U+7fe8-7fe9, U+7feb-7fec, U+7fee-7ff0, U+7ff2-7ff3, U+7ff9-7ffa, U+7ffd-7fff, U+8002, U+8004, U+8006-8008, U+800a-800f, U+8011-8014, U+8016, U+8018-8019, U+801c-8021, U+8024, U+8026, U+8028, U+802c, U+802e, U+8030, U+8034-8035, U+8037, U+8039-8040, U+8043-8044, U+8046, U+804a, U+8052, U+8058, U+805a, U+805f-8060, U+8062, U+8064, U+8066, U+8068, U+806d, U+806f-8073, U+8075-8076, U+8079, U+807b, U+807d-8081, U+8084-8088, U+808b, U+808e, U+8093, U+8099-809a, U+809c, U+809e, U+80a4, U+80a6-80a7, U+80ab-80ad, U+80b1, U+80b8-80b9, U+80c4-80c5, U+80c8, U+80ca, U+80cd, U+80cf, U+80d2, U+80d4-80db, U+80dd, U+80e0, U+80e4-80e6, U+80ed-80f3, U+80f5-80f7, U+80f9-80fc, U+80fe, U+8101, U+8103, U+8109, U+810b, U+810d, U+8116-8118, U+811b-811c, U+811e, U+8120, U+8123-8124, U+8127, U+8129, U+812b-812c, U+812f-8130, U+8135, U+8139-813a, U+813c-813e, U+8141, U+8145-8147; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.23.woff2) format('woff2'); - unicode-range: U+7d57, U+7d59-7d5d, U+7d63, U+7d65, U+7d67, U+7d6a, U+7d6e, U+7d70, U+7d72-7d73, U+7d78, U+7d7a-7d7b, U+7d7d, U+7d7f, U+7d81-7d83, U+7d85-7d86, U+7d88-7d89, U+7d8b-7d8d, U+7d8f, U+7d91, U+7d93, U+7d96-7d97, U+7d9b-7da0, U+7da2-7da3, U+7da6-7da7, U+7daa-7dac, U+7dae-7db0, U+7db3, U+7db5-7db9, U+7dbd, U+7dc0, U+7dc2-7dc7, U+7dcc-7dce, U+7dd0, U+7dd5-7dd9, U+7ddc-7dde, U+7de1-7de6, U+7dea-7ded, U+7df1-7df2, U+7df5-7df6, U+7df9-7dfa, U+7e00, U+7e05, U+7e08-7e0b, U+7e10-7e12, U+7e15, U+7e17, U+7e1c-7e1d, U+7e1f-7e23, U+7e27-7e28, U+7e2c-7e2d, U+7e2f, U+7e31-7e33, U+7e35-7e37, U+7e39-7e3b, U+7e3d, U+7e3f, U+7e43-7e48, U+7e4e, U+7e50, U+7e52, U+7e56, U+7e58-7e5a, U+7e5d-7e5f, U+7e61-7e62, U+7e65-7e67, U+7e69-7e6b, U+7e6d-7e6f, U+7e73, U+7e75, U+7e78-7e79, U+7e7b-7e7f, U+7e81-7e83, U+7e86-7e8a, U+7e8c-7e8e, U+7e90-7e96, U+7e98, U+7e9a-7e9f, U+7f38, U+7f3a-7f3f, U+7f43-7f45, U+7f47, U+7f4c-7f50, U+7f52-7f55, U+7f58, U+7f5b-7f5d, U+7f5f, U+7f61, U+7f63-7f69, U+7f6b, U+7f6d, U+7f71; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.24.woff2) format('woff2'); - unicode-range: U+7bc8, U+7bca-7bcc, U+7bcf, U+7bd4, U+7bd6-7bd7, U+7bd9-7bdb, U+7bdd, U+7be5-7be6, U+7be8-7bea, U+7bf0, U+7bf2-7bfa, U+7bfc, U+7bfe, U+7c00-7c04, U+7c06-7c07, U+7c09, U+7c0b-7c0f, U+7c11-7c14, U+7c17, U+7c19, U+7c1b, U+7c1e-7c20, U+7c23, U+7c25-7c28, U+7c2a-7c2c, U+7c2f, U+7c31, U+7c33-7c34, U+7c36-7c3a, U+7c3d-7c3e, U+7c40, U+7c42-7c43, U+7c45-7c46, U+7c4a, U+7c4c, U+7c4f-7c5f, U+7c61, U+7c63-7c65, U+7c67, U+7c69, U+7c6c-7c70, U+7c72, U+7c75, U+7c79, U+7c7b-7c7e, U+7c81-7c83, U+7c86-7c87, U+7c8d, U+7c8f-7c90, U+7c94, U+7c9e, U+7ca0-7ca2, U+7ca4-7ca6, U+7ca8, U+7cab, U+7cad-7cae, U+7cb0-7cb3, U+7cb6-7cb7, U+7cb9-7cbd, U+7cbf-7cc0, U+7cc2, U+7cc4-7cc5, U+7cc7-7cca, U+7ccd-7ccf, U+7cd2-7cd5, U+7cd7-7cda, U+7cdc-7cdd, U+7cdf-7ce0, U+7ce2, U+7ce6, U+7ce9, U+7ceb, U+7cef, U+7cf2, U+7cf4-7cf6, U+7cf9-7cfa, U+7cfe, U+7d02-7d03, U+7d06-7d0a, U+7d0f, U+7d11-7d13, U+7d15-7d16, U+7d1c-7d1e, U+7d23, U+7d26, U+7d2a, U+7d2c-7d2e, U+7d31-7d32, U+7d35, U+7d3c-7d41, U+7d43, U+7d45, U+7d47-7d48, U+7d4b, U+7d4d-7d4f, U+7d51, U+7d53, U+7d55-7d56; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.25.woff2) format('woff2'); - unicode-range: U+7a17-7a19, U+7a1b, U+7a1e-7a21, U+7a27, U+7a2b, U+7a2d, U+7a2f-7a31, U+7a34-7a35, U+7a37-7a3b, U+7a3e, U+7a43-7a49, U+7a4c, U+7a4e, U+7a50, U+7a55-7a57, U+7a59, U+7a5c-7a5d, U+7a5f-7a63, U+7a65, U+7a67, U+7a69-7a6a, U+7a6d, U+7a70, U+7a75, U+7a78-7a79, U+7a7d-7a7e, U+7a80, U+7a82, U+7a84-7a86, U+7a88, U+7a8a-7a8b, U+7a90-7a91, U+7a94-7a98, U+7a9e, U+7aa0, U+7aa3, U+7aa9, U+7aac, U+7ab0, U+7ab3, U+7ab5-7ab6, U+7ab9-7abf, U+7ac3, U+7ac5-7aca, U+7acc-7acf, U+7ad1-7ad3, U+7ad5, U+7ada-7adb, U+7add, U+7adf, U+7ae1-7ae2, U+7ae6-7aed, U+7af0-7af1, U+7af4, U+7af8, U+7afa-7afb, U+7afd-7afe, U+7b02, U+7b04, U+7b06-7b08, U+7b0a-7b0b, U+7b0f, U+7b12, U+7b14, U+7b18-7b19, U+7b1e-7b1f, U+7b23, U+7b25, U+7b27-7b2b, U+7b2d-7b31, U+7b33-7b36, U+7b3b, U+7b3d, U+7b3f-7b41, U+7b45, U+7b47, U+7b4c-7b50, U+7b53, U+7b55, U+7b5d, U+7b60, U+7b64-7b66, U+7b69-7b6a, U+7b6c-7b75, U+7b77, U+7b79-7b7a, U+7b7f, U+7b84, U+7b86, U+7b89, U+7b8d-7b92, U+7b96, U+7b98-7ba0, U+7ba5, U+7bac-7bad, U+7baf-7bb0, U+7bb2, U+7bb4-7bb6, U+7bba-7bbd, U+7bc1-7bc2, U+7bc5-7bc6; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.26.woff2) format('woff2'); - unicode-range: U+7851-7852, U+785c, U+785e, U+7860-7861, U+7863-7864, U+7868, U+786a, U+786e-786f, U+7872, U+7874, U+787a, U+787c, U+787e, U+7886-7887, U+788a, U+788c-788f, U+7893-7895, U+7898, U+789a, U+789d-789f, U+78a1, U+78a3-78a4, U+78a8-78aa, U+78ac-78ad, U+78af-78b3, U+78b5, U+78bb-78bf, U+78c5-78cc, U+78ce, U+78d1-78d6, U+78da-78db, U+78df-78e1, U+78e4, U+78e6-78e7, U+78ea, U+78ec, U+78f2-78f4, U+78f6-78f7, U+78f9-78fb, U+78fd-7901, U+7906-7907, U+790c, U+7910-7912, U+7919-791c, U+791e-7920, U+7925-792e, U+7930-7931, U+7934-7935, U+793b, U+793d, U+793f, U+7941-7942, U+7944-7946, U+794a-794b, U+794f, U+7951, U+7954-7955, U+7957-7958, U+795a-795c, U+795f-7960, U+7962, U+7967, U+7969, U+796b, U+7972, U+7977, U+7979-797c, U+797e-7980, U+798a-798e, U+7991, U+7993-7996, U+7998, U+799b-799d, U+79a1, U+79a6-79ab, U+79ae-79b1, U+79b3-79b4, U+79b8-79bb, U+79bd-79be, U+79c2, U+79c4, U+79c7-79ca, U+79cc-79cd, U+79cf, U+79d4-79d6, U+79da, U+79dd-79e3, U+79e5, U+79e7, U+79ea-79ed, U+79f1, U+79f8, U+79fc, U+7a02-7a03, U+7a05, U+7a07-7a0a, U+7a0c-7a0d, U+7a11, U+7a15; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.27.woff2) format('woff2'); - unicode-range: U+768c-768e, U+7690, U+7693, U+7695-7696, U+7699-76a8, U+76aa, U+76ad, U+76af-76b0, U+76b4, U+76b6-76ba, U+76bd, U+76c1-76c3, U+76c5, U+76c8-76c9, U+76cb-76ce, U+76d2, U+76d4, U+76d6, U+76d9, U+76dc, U+76de, U+76e0-76e1, U+76e5-76e8, U+76ea-76ec, U+76f0-76f1, U+76f6, U+76f9, U+76fb-76fc, U+7700, U+7704, U+7706-7708, U+770a, U+770e, U+7712, U+7714-7715, U+7717, U+7719-771c, U+7722, U+7724-7726, U+7728, U+772d-772f, U+7734-7739, U+773d-773e, U+7742, U+7745-7747, U+774a, U+774d-774f, U+7752, U+7756-7758, U+775a-775c, U+775e-7760, U+7762, U+7764-7765, U+7767, U+776a-776c, U+7770, U+7772-7774, U+7779-777a, U+777c-7780, U+7784, U+778b-778e, U+7794-7796, U+779a, U+779e-77a0, U+77a2, U+77a4-77a5, U+77a7, U+77a9-77aa, U+77ae-77b1, U+77b5-77b7, U+77b9, U+77bb-77bf, U+77c3, U+77c7, U+77c9, U+77cd, U+77d1-77d2, U+77d5, U+77d7, U+77d9-77da, U+77dc, U+77de-77e0, U+77e3-77e4, U+77e6-77e7, U+77e9-77ea, U+77ec, U+77ee, U+77f0-77f1, U+77f4, U+77f8, U+77fb-77fc, U+7805-7806, U+7809, U+780c-780e, U+7811-7812, U+7819, U+781d, U+7820-7823, U+7826-7827, U+782c-782e, U+7830, U+7835, U+7837, U+783a, U+783f, U+7843-7845, U+7847-7848, U+784c, U+784e-784f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.28.woff2) format('woff2'); - unicode-range: U+7511-7513, U+7515-7517, U+751c, U+751e, U+7520-7522, U+7524, U+7526-7527, U+7529-752c, U+752f, U+7536, U+7538-7539, U+753c-7540, U+7543-7544, U+7546-754b, U+754d-7550, U+7552, U+7557, U+755a-755b, U+755d-755f, U+7561-7562, U+7564, U+7566-7567, U+7569, U+756b-756d, U+756f, U+7571-7572, U+7574-757e, U+7581-7582, U+7585-7587, U+7589-758c, U+758f-7590, U+7592-7595, U+7599-759a, U+759c-759d, U+75a2-75a5, U+75b0-75b1, U+75b3-75b5, U+75b7-75b8, U+75ba, U+75bd, U+75bf-75c4, U+75c6, U+75ca, U+75cc-75cf, U+75d3-75d4, U+75d7-75d8, U+75dc-75e1, U+75e3-75e4, U+75e7, U+75ec, U+75ee-75f3, U+75f9, U+75fc, U+75fe-7604, U+7607-760c, U+760f, U+7612-7613, U+7615-7616, U+7618-7619, U+761b-7629, U+762d, U+7630, U+7632-7635, U+7638-763c, U+7640-7641, U+7643-764b, U+764e, U+7655, U+7658-7659, U+765c, U+765f, U+7661-7662, U+7664-7665, U+7667-766a, U+766c-7672, U+7674, U+7676, U+7678, U+7680-7683, U+7685, U+7688, U+768b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.29.woff2) format('woff2'); - unicode-range: U+736c, U+736e-7371, U+7375, U+7377-737c, U+7380-7381, U+7383, U+7385-7386, U+738a, U+738e, U+7390, U+7393-7398, U+739c, U+739e-73a0, U+73a2, U+73a5-73a6, U+73a8, U+73aa-73ab, U+73ad, U+73b3, U+73b5, U+73b7, U+73b9-73bd, U+73bf, U+73c5-73c6, U+73c9-73cc, U+73ce-73cf, U+73d2-73d3, U+73d6, U+73d9, U+73dd-73de, U+73e1, U+73e3-73e7, U+73e9-73ea, U+73ee, U+73f1, U+73f4-73f5, U+73f7-73fb, U+73fd, U+73ff-7401, U+7404-7405, U+7407, U+740a, U+7411, U+7413, U+741a-741b, U+7421, U+7424, U+7426, U+7428-7431, U+7433, U+7439-743a, U+743f-7441, U+7443-7444, U+7446-7447, U+744b, U+744d, U+7451-7453, U+7455, U+7457, U+7459-745a, U+745c-745d, U+745f, U+7462-7464, U+7466-746b, U+746d-7473, U+7476, U+747e, U+7480-7481, U+7485-7489, U+748b, U+748f-7492, U+7497-749a, U+749c, U+749e-74a3, U+74a5-74a6, U+74a8-74ab, U+74ae-74af, U+74b1-74b2, U+74b5, U+74b9-74bb, U+74bd, U+74bf, U+74c8-74ca, U+74cc, U+74cf-74d0, U+74d3-74d4, U+74d6, U+74d8, U+74da-74db, U+74de-74e0, U+74e3-74e4, U+74e7-74eb, U+74ee-74f2, U+74f4, U+74f7-74f8, U+74fa-74fc, U+74ff, U+7501, U+7503-7506, U+750c-750e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.30.woff2) format('woff2'); - unicode-range: U+7166, U+7168, U+716c, U+7179, U+7180, U+7184-7185, U+7187-7188, U+718c, U+718f, U+7192, U+7194-7196, U+7199-719b, U+71a0, U+71a2, U+71a8, U+71ac, U+71ae-71b0, U+71b2-71b3, U+71b9-71ba, U+71be-71c1, U+71c4, U+71c9, U+71cb-71cc, U+71ce, U+71d0, U+71d2-71d4, U+71d6-71d7, U+71d9-71da, U+71dc, U+71df-71e0, U+71e6-71e7, U+71ec-71ee, U+71f4-71f5, U+71f8-71f9, U+71fc, U+71fe-7200, U+7207-7209, U+720d, U+7210, U+7213, U+7215, U+7217, U+721a, U+721d, U+721f, U+7224, U+7228, U+722b, U+722d, U+722f-7230, U+7232, U+7234, U+7238-7239, U+723b-723c, U+723e-7243, U+7245-7246, U+724b, U+724e-7250, U+7252-7253, U+7255-7258, U+725a, U+725c, U+725e, U+7260, U+7263, U+7268, U+726b, U+726e-726f, U+7271, U+7274, U+7277-7278, U+727b-727c, U+727e-7282, U+7284, U+7287, U+7289, U+728d-728e, U+7292-7293, U+7296, U+729b, U+72a2, U+72a7-72a8, U+72ad-72ae, U+72b0-72b2, U+72b4, U+72b9, U+72be, U+72c0-72c1, U+72c3-72c4, U+72c6-72c7, U+72c9, U+72cc, U+72ce, U+72d2, U+72d5-72d6, U+72d8, U+72df-72e2, U+72e5, U+72f3-72f4, U+72f7, U+72f9-72fb, U+72fd-72fe, U+7302, U+7304-7305, U+7307, U+730a-730b, U+730d, U+7312-7313, U+7316-7319, U+731c-731e, U+7322, U+7324, U+7327-7329, U+732c, U+732f, U+7331-7337, U+7339-733b, U+733d-733e, U+7343, U+734d-7350, U+7352, U+7356-7358, U+735d-7360, U+7366-736b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.31.woff2) format('woff2'); - unicode-range: U+6f58-6f5b, U+6f5d-6f5e, U+6f60-6f62, U+6f66, U+6f68, U+6f6c-6f6d, U+6f6f, U+6f74, U+6f78, U+6f7a, U+6f7c-6f7e, U+6f80, U+6f82-6f83, U+6f86-6f88, U+6f8b-6f8e, U+6f90-6f94, U+6f96-6f98, U+6f9a, U+6f9d, U+6f9f-6fa1, U+6fa3, U+6fa5-6fa8, U+6fae-6fb1, U+6fb3, U+6fb5-6fb7, U+6fb9, U+6fbc, U+6fbe, U+6fc2, U+6fc5-6fca, U+6fd4-6fd5, U+6fd8, U+6fda-6fdb, U+6fde-6fe0, U+6fe4, U+6fe8-6fe9, U+6feb-6fec, U+6fee, U+6ff0, U+6ff3, U+6ff5-6ff6, U+6ff9-6ffa, U+6ffc-6ffe, U+7000-7001, U+7005-7007, U+7009-700b, U+700d, U+700f, U+7011, U+7015, U+7017-7018, U+701a-701b, U+701d-7020, U+7023, U+7026, U+7028, U+702f-7030, U+7032, U+7034, U+7037, U+7039-703a, U+703c, U+703e, U+7043-7044, U+7047-704c, U+704e, U+7051, U+7054-7055, U+705d-705e, U+7064-7065, U+7069, U+706c, U+706e, U+7075-7076, U+707e, U+7081, U+7085-7086, U+7094-7098, U+709b, U+709f, U+70a4, U+70ab-70ac, U+70ae-70b1, U+70b3-70b4, U+70b7, U+70bb, U+70ca-70cb, U+70d1, U+70d3-70d6, U+70d8-70d9, U+70dc-70dd, U+70df, U+70e4, U+70ec, U+70f1, U+70fa, U+70fd, U+7103-7108, U+710b-710c, U+710f, U+7114, U+7119, U+711c, U+711e, U+7120, U+712b, U+712d-7131, U+7138, U+7141, U+7145-7147, U+7149-714b, U+7150-7153, U+7155-7157, U+715a, U+715c, U+715e, U+7160, U+7162, U+7164-7165; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.32.woff2) format('woff2'); - unicode-range: U+6d7c, U+6d80-6d82, U+6d85, U+6d87, U+6d89-6d8a, U+6d8c-6d8e, U+6d91-6d98, U+6d9c, U+6daa-6dac, U+6dae, U+6db4-6db5, U+6db7-6db9, U+6dbd, U+6dbf, U+6dc2, U+6dc4-6dc8, U+6dca, U+6dcc, U+6dce-6dd0, U+6dd2, U+6dd5-6dd6, U+6dd8-6ddb, U+6ddd-6de0, U+6de2, U+6de4-6de6, U+6de8-6dea, U+6dec, U+6dee-6df0, U+6df2, U+6df4, U+6df6, U+6df8-6dfa, U+6dfc, U+6e00, U+6e04, U+6e0a, U+6e17, U+6e19, U+6e1d-6e20, U+6e22-6e25, U+6e27, U+6e2b, U+6e2d-6e2e, U+6e32, U+6e34, U+6e36, U+6e38-6e3c, U+6e42-6e45, U+6e48-6e49, U+6e4b-6e4f, U+6e51-6e54, U+6e57, U+6e5b-6e5f, U+6e62-6e63, U+6e68, U+6e6b, U+6e6e, U+6e72-6e73, U+6e76, U+6e7b, U+6e7d, U+6e82, U+6e89, U+6e8c-6e8d, U+6e8f, U+6e93, U+6e98-6e99, U+6e9f-6ea0, U+6ea5, U+6ea7, U+6eaa-6eab, U+6ead-6eaf, U+6eb1-6eb4, U+6eb7, U+6ebb-6ebd, U+6ebf-6ec4, U+6ec7-6eca, U+6ecc-6ecf, U+6ed3-6ed5, U+6ed9-6edb, U+6ee6, U+6eeb-6eef, U+6ef7-6ef9, U+6efb, U+6efd-6eff, U+6f04, U+6f08-6f0a, U+6f0c-6f0d, U+6f10-6f11, U+6f13, U+6f15-6f16, U+6f18, U+6f1a-6f1b, U+6f25-6f26, U+6f29-6f2a, U+6f2d, U+6f2f-6f33, U+6f35-6f36, U+6f38, U+6f3b-6f3c, U+6f3e-6f3f, U+6f41, U+6f45, U+6f4f, U+6f51-6f53, U+6f57; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.33.woff2) format('woff2'); - unicode-range: U+6b85, U+6b89, U+6b8d, U+6b95, U+6b97-6b98, U+6b9b, U+6b9e-6ba0, U+6ba2-6ba4, U+6ba8-6bb3, U+6bb7-6bb9, U+6bbc-6bbe, U+6bc0, U+6bc3-6bc4, U+6bc6-6bc9, U+6bcb-6bcc, U+6bcf, U+6bd3, U+6bd6-6bd8, U+6bda, U+6bdf, U+6be1, U+6be3, U+6be6-6be7, U+6beb-6bec, U+6bee, U+6bf1, U+6bf3, U+6bf7, U+6bf9, U+6bff, U+6c02, U+6c04-6c05, U+6c08-6c0a, U+6c0d-6c0e, U+6c10, U+6c12-6c14, U+6c19, U+6c1b, U+6c1f, U+6c24, U+6c26-6c28, U+6c2c, U+6c2e, U+6c33, U+6c35-6c36, U+6c3a-6c3b, U+6c3e-6c40, U+6c4a-6c4b, U+6c4d, U+6c4f, U+6c52, U+6c54-6c55, U+6c59, U+6c5b-6c5e, U+6c62, U+6c67-6c68, U+6c6a-6c6b, U+6c6d, U+6c6f, U+6c73-6c74, U+6c76, U+6c78-6c79, U+6c7b, U+6c7e, U+6c81-6c87, U+6c89, U+6c8c-6c8d, U+6c90, U+6c92-6c95, U+6c97-6c98, U+6c9a-6c9c, U+6c9f, U+6caa-6cae, U+6cb0-6cb2, U+6cb4, U+6cba, U+6cbd-6cbe, U+6cc2, U+6cc5-6cc6, U+6ccd, U+6ccf-6cd4, U+6cd6-6cd7, U+6cd9-6cdd, U+6ce0, U+6ce7, U+6ce9-6cef, U+6cf1-6cf2, U+6cf4, U+6cfb, U+6d00-6d01, U+6d04, U+6d07, U+6d0a, U+6d0c, U+6d0e-6d0f, U+6d11, U+6d13, U+6d19-6d1a, U+6d1f, U+6d24, U+6d26-6d28, U+6d2b, U+6d2e-6d2f, U+6d31, U+6d33-6d36, U+6d38-6d39, U+6d3c-6d3d, U+6d3f, U+6d57-6d5b, U+6d5e-6d61, U+6d64-6d65, U+6d67, U+6d6c, U+6d6f-6d70, U+6d79; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.34.woff2) format('woff2'); - unicode-range: U+69dd-69de, U+69e2-69e3, U+69e5, U+69e7-69eb, U+69ed-69ef, U+69f1-69f6, U+69f9, U+69fe-6a01, U+6a03, U+6a05, U+6a0a, U+6a0c, U+6a0f, U+6a11-6a15, U+6a17, U+6a1a-6a1b, U+6a1d-6a20, U+6a22-6a24, U+6a28, U+6a2e, U+6a30, U+6a32-6a38, U+6a3b, U+6a3e-6a3f, U+6a44-6a4a, U+6a4e, U+6a50-6a52, U+6a54-6a56, U+6a5b, U+6a61-6a62, U+6a64, U+6a66-6a67, U+6a6a-6a6b, U+6a71-6a73, U+6a78, U+6a7a, U+6a7e-6a7f, U+6a81, U+6a83-6a84, U+6a86-6a87, U+6a89, U+6a8b, U+6a8d, U+6a90-6a91, U+6a94, U+6a97, U+6a9b, U+6a9d-6aa3, U+6aa5, U+6aaa-6aac, U+6aae-6ab1, U+6ab3-6ab4, U+6ab8, U+6abb, U+6abd-6abf, U+6ac1-6ac3, U+6ac6, U+6ac8-6ac9, U+6acc, U+6ad0-6ad1, U+6ad3-6ad6, U+6ada-6adf, U+6ae2, U+6ae4, U+6ae7-6ae8, U+6aea, U+6aec, U+6af0-6af3, U+6af8, U+6afa, U+6afc-6afd, U+6b02-6b03, U+6b06-6b07, U+6b09-6b0b, U+6b0f-6b12, U+6b16-6b17, U+6b1b, U+6b1d-6b1f, U+6b23-6b24, U+6b28, U+6b2b-6b2c, U+6b2f, U+6b35-6b39, U+6b3b, U+6b3d, U+6b3f, U+6b43, U+6b46-6b47, U+6b49-6b4a, U+6b4d-6b4e, U+6b50, U+6b52, U+6b54, U+6b56, U+6b58-6b59, U+6b5b, U+6b5d, U+6b5f-6b61, U+6b65, U+6b67, U+6b6b-6b6c, U+6b6e, U+6b70, U+6b72, U+6b75, U+6b77-6b7a, U+6b7d-6b84; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.35.woff2) format('woff2'); - unicode-range: U+6855, U+6857-6859, U+685b, U+685d, U+685f, U+6863, U+6867, U+686b, U+686e-6872, U+6874-6875, U+6877, U+6879-687c, U+687e-687f, U+6882-6884, U+6886, U+6888, U+688d-6890, U+6894, U+6896, U+6898-689c, U+689f-68a3, U+68a5-68a7, U+68a9-68ab, U+68ad-68af, U+68b2-68b5, U+68b9-68bc, U+68c3, U+68c5-68c6, U+68c8-68ca, U+68cc-68cd, U+68cf-68d1, U+68d3-68d9, U+68dc-68dd, U+68e0-68e1, U+68e3-68e5, U+68e7-68e8, U+68ea-68ed, U+68ef-68f1, U+68f5-68f7, U+68f9, U+68fb-68fd, U+6900-6901, U+6903-6904, U+6906-690c, U+690f-6911, U+6913, U+6916-6917, U+6919-691b, U+6921-6923, U+6925-6926, U+6928, U+692a, U+6930-6931, U+6933-6936, U+6938-6939, U+693b, U+693d, U+6942, U+6945-6946, U+6949, U+694e, U+6954, U+6957, U+6959, U+695b-695e, U+6961-6966, U+6968-696c, U+696e-6974, U+6977-697b, U+697e-6981, U+6986, U+698d, U+6991-6992, U+6994-6996, U+6998, U+699c, U+69a0-69a1, U+69a5-69a8, U+69ab, U+69ad, U+69af-69b2, U+69b4, U+69b7-69b8, U+69ba-69bc, U+69be-69c1, U+69c3, U+69c5, U+69c7-69c8, U+69ca, U+69ce-69d1, U+69d3, U+69d6-69d7, U+69d9; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.36.woff2) format('woff2'); - unicode-range: U+667e-6680, U+6683-6684, U+6688, U+668b-668e, U+6690, U+6692, U+6698-669d, U+669f-66a0, U+66a2, U+66a4, U+66ad, U+66b1-66b3, U+66b5, U+66b8-66b9, U+66bb-66bc, U+66be-66c4, U+66c6, U+66c8-66c9, U+66cc, U+66ce-66cf, U+66d4, U+66da-66db, U+66dd, U+66df-66e0, U+66e6, U+66e8-66e9, U+66eb-66ec, U+66ee, U+66f5, U+66f7, U+66fa-66fc, U+6701, U+6705, U+6707, U+670c, U+670e-6710, U+6712-6716, U+6719, U+671c, U+671e, U+6720, U+6722, U+6725-6726, U+672e, U+6733, U+6735-6738, U+673e-673f, U+6741, U+6743, U+6745-6748, U+674c-674d, U+6753-6755, U+6759, U+675d-675e, U+6760, U+6762-6764, U+6766, U+676a, U+676c, U+676e, U+6770, U+6772-6774, U+6776-6777, U+677b-677c, U+6780-6781, U+6784-6785, U+6787, U+6789, U+678b-678c, U+678e-678f, U+6791-6793, U+6796, U+6798-6799, U+679b, U+67a1, U+67a4, U+67a6, U+67a9, U+67b0-67b5, U+67b7-67b9, U+67bb-67be, U+67c0-67c3, U+67c5-67c6, U+67c8-67c9, U+67ce, U+67d2, U+67d7-67d9, U+67db-67de, U+67e1-67e2, U+67e4, U+67e6-67e7, U+67e9, U+67ec, U+67ee-67f0, U+67f2, U+67f6-67f7, U+67f9-67fa, U+67fc, U+67fe, U+6801-6802, U+6805, U+6810, U+6814, U+6818-6819, U+681d, U+681f, U+6822, U+6827-6829, U+682b-682d, U+682f-6834, U+683b, U+683e-6840, U+6844-6846, U+6849-684a, U+684c-684e, U+6852-6854; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.37.woff2) format('woff2'); - unicode-range: U+64d2, U+64d4-64d5, U+64d7-64d8, U+64da, U+64e0-64e1, U+64e3-64e5, U+64e7, U+64e9-64ea, U+64ed, U+64ef-64f2, U+64f4-64f7, U+64fa-64fb, U+64fd-6501, U+6504-6505, U+6508-650a, U+650f, U+6513-6514, U+6516, U+6518-6519, U+651b-651f, U+6522, U+6524, U+6526, U+6529-652c, U+652e, U+6531-6532, U+6534-6538, U+653a, U+653c-653d, U+6543-6544, U+6547-6549, U+654d-654e, U+6550, U+6552, U+6554-6556, U+6558, U+655d-6560, U+6567, U+656b, U+6572, U+6578, U+657a, U+657d, U+6581-6585, U+6588, U+658a, U+658c, U+6592, U+6595, U+6598, U+659b, U+659d, U+659f-65a1, U+65a3-65a6, U+65ab, U+65ae, U+65b2-65b5, U+65b7-65b8, U+65be-65bf, U+65c1-65c4, U+65c6, U+65c8-65c9, U+65cc, U+65ce, U+65d0, U+65d2, U+65d4, U+65d6, U+65d8-65d9, U+65db, U+65df-65e1, U+65e3, U+65f0-65f2, U+65f4-65f5, U+65f9, U+65fb-65fc, U+65fe-6600, U+6603-6604, U+6608-660a, U+660d, U+6611-6612, U+6615-6616, U+661c-661e, U+6621-6624, U+6626, U+6629-662c, U+662e, U+6630-6631, U+6633-6637, U+6639-663b, U+663f-6641, U+6644-6646, U+6648-664a, U+664c, U+664e-664f, U+6651, U+6657-6665, U+6667-6668, U+666a-666d, U+6670, U+6673, U+6675, U+6677-6679, U+667b-667c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.38.woff2) format('woff2'); - unicode-range: U+62cf, U+62d1, U+62d4-62d6, U+62da, U+62dc, U+62ea, U+62ee-62ef, U+62f1-62f2, U+62f4-62f5, U+62fc-62fd, U+62ff, U+6302-6304, U+6308-630d, U+6310, U+6313, U+6316, U+6318, U+631b, U+6327, U+6329-632a, U+632d, U+6332, U+6335-6336, U+6339-633c, U+633e, U+6341-6344, U+6346, U+634a-634e, U+6350, U+6352-6354, U+6358-6359, U+635b, U+6365-6366, U+6369, U+636b-636d, U+6371-6372, U+6374-6378, U+637a, U+637c-637d, U+637f-6380, U+6382, U+6384, U+6387, U+6389-638a, U+638e-6390, U+6394-6396, U+6399-639a, U+639e, U+63a0, U+63a3-63a4, U+63a6, U+63a9, U+63ab-63af, U+63b5, U+63bd-63be, U+63c0-63c1, U+63c4-63c6, U+63c8, U+63ce, U+63d1-63d6, U+63dc, U+63e0, U+63e3, U+63e5, U+63e9-63ed, U+63f2-63f3, U+63f5-63f9, U+6406, U+6409-640a, U+640f-6410, U+6412-6414, U+6416-6418, U+641e, U+6420, U+6422, U+6424-6426, U+6428-642a, U+642f-6430, U+6434-6436, U+643d, U+643f, U+644b, U+644e-644f, U+6451-6454, U+645a-645d, U+645f-6461, U+6463, U+6467, U+646d, U+6473-6474, U+6476, U+6478-6479, U+647b, U+647d, U+6485, U+6487-6488, U+648f-6491, U+6493, U+6495, U+6498-649b, U+649d-649f, U+64a1, U+64a3, U+64a6, U+64a8-64a9, U+64ac, U+64b3, U+64bb-64bf, U+64c2, U+64c4-64c5, U+64c7, U+64c9-64cc, U+64ce, U+64d0-64d1; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.39.woff2) format('woff2'); - unicode-range: U+6117, U+6119, U+611c, U+611e, U+6120-6122, U+6127-6128, U+612a-612c, U+6130-6131, U+6134-6137, U+6139-613a, U+613c-613f, U+6141-6142, U+6144-6147, U+6149-614a, U+614d, U+6153, U+6158-615a, U+615d-6160, U+6164-6165, U+616b-616c, U+616f, U+6171-6175, U+6177-6178, U+617b-6181, U+6183-6184, U+6187, U+618a-618b, U+618d, U+6192-6194, U+6196-619a, U+619c-619d, U+619f-61a0, U+61a5, U+61a8, U+61aa-61ae, U+61b8-61ba, U+61bc, U+61be, U+61c0-61c3, U+61c6, U+61c8, U+61ca-61cf, U+61d5, U+61dc-61df, U+61e1-61e3, U+61e5-61e9, U+61ec-61ed, U+61ef, U+61f4-61f7, U+61fa, U+61fc-6201, U+6203-6204, U+6207-620a, U+620d-620e, U+6213-6215, U+621b-621e, U+6220-6223, U+6227, U+6229-622b, U+622e, U+6230-6233, U+6236, U+6239, U+623d-623e, U+6241-6244, U+6246, U+6248, U+624c, U+624e, U+6250-6252, U+6254, U+6256, U+6258, U+625a-625c, U+625e, U+6260-6261, U+6263-6264, U+6268, U+626d, U+626f, U+6273, U+627a-627e, U+6282-6283, U+6285, U+6289, U+628d-6290, U+6292-6294, U+6296, U+6299, U+629b, U+62a6, U+62a8, U+62ac, U+62b3, U+62b6-62b7, U+62ba-62bb, U+62be-62bf, U+62c2, U+62c4, U+62c6-62c8, U+62ca, U+62ce; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.40.woff2) format('woff2'); - unicode-range: U+5f6c-5f6d, U+5f6f, U+5f72-5f75, U+5f78, U+5f7a, U+5f7d-5f7f, U+5f82-5f83, U+5f87-5f89, U+5f8d, U+5f8f, U+5f91, U+5f96, U+5f99, U+5f9c-5f9d, U+5fa0, U+5fa2, U+5fa4, U+5fa7-5fa8, U+5fab-5fad, U+5faf-5fb1, U+5fb5, U+5fb7-5fb8, U+5fbc-5fbd, U+5fc4, U+5fc7-5fc9, U+5fcb, U+5fd0-5fd4, U+5fdd-5fde, U+5fe1-5fe2, U+5fe4, U+5fe8-5fea, U+5fec-5ff3, U+5ff6, U+5ff8, U+5ffa-5ffd, U+5fff, U+6007, U+600a, U+600d-6010, U+6013-6015, U+6017-601b, U+601f, U+6021-6022, U+6024, U+6026, U+6029, U+602b, U+602d, U+6031, U+6033, U+6035, U+603a, U+6040-6043, U+6046-604a, U+604c-604d, U+6051, U+6054-6057, U+6059-605a, U+605d, U+605f-6064, U+6067, U+606a-606c, U+6070-6071, U+6077, U+607e-607f, U+6081-6086, U+6088-608e, U+6091-6093, U+6095-6098, U+609a-609b, U+609d-609e, U+60a2, U+60a4-60a5, U+60a7-60a8, U+60b0-60b1, U+60b3-60b5, U+60b7-60b8, U+60bb, U+60bd-60be, U+60c2, U+60c4, U+60c6-60cb, U+60ce-60cf, U+60d3-60d5, U+60d8-60d9, U+60db, U+60dd-60df, U+60e1-60e2, U+60e5, U+60ee, U+60f0-60f2, U+60f4-60f8, U+60fa-60fd, U+6100, U+6102-6103, U+6106-6108, U+610a, U+610c-610e, U+6110-6114, U+6116; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.41.woff2) format('woff2'); - unicode-range: U+5d9b, U+5d9d, U+5d9f-5da0, U+5da2, U+5da4, U+5da7, U+5dab-5dac, U+5dae, U+5db0, U+5db2, U+5db4, U+5db7-5db9, U+5dbc-5dbd, U+5dc3, U+5dc7, U+5dc9, U+5dcb-5dce, U+5dd0-5dd3, U+5dd6-5dd9, U+5ddb, U+5de0, U+5de2, U+5de4, U+5de9, U+5df2, U+5df5, U+5df8-5df9, U+5dfd, U+5dff-5e00, U+5e07, U+5e0b, U+5e0d, U+5e11-5e12, U+5e14-5e15, U+5e18-5e1b, U+5e1f-5e20, U+5e25, U+5e28, U+5e2e, U+5e32, U+5e35-5e37, U+5e3e, U+5e40, U+5e43-5e44, U+5e47, U+5e49, U+5e4b, U+5e4e, U+5e50-5e51, U+5e54, U+5e56-5e58, U+5e5b-5e5c, U+5e5e-5e5f, U+5e62, U+5e64, U+5e68, U+5e6a-5e6e, U+5e70, U+5e75-5e77, U+5e7a, U+5e7f-5e80, U+5e87, U+5e8b, U+5e8e, U+5e96, U+5e99-5e9a, U+5ea0, U+5ea2, U+5ea4-5ea5, U+5ea8, U+5eaa, U+5eac, U+5eb1, U+5eb3, U+5eb8-5eb9, U+5ebd-5ebf, U+5ec1-5ec2, U+5ec6, U+5ec8, U+5ecb-5ecc, U+5ece-5ed6, U+5ed9-5ee2, U+5ee5, U+5ee8-5ee9, U+5eeb-5eec, U+5ef0-5ef1, U+5ef3-5ef4, U+5ef8-5ef9, U+5efc-5f00, U+5f02-5f03, U+5f06-5f09, U+5f0b-5f0e, U+5f11, U+5f16-5f17, U+5f19, U+5f1b-5f1e, U+5f21-5f24, U+5f27-5f29, U+5f2b-5f30, U+5f34, U+5f36, U+5f38, U+5f3a-5f3d, U+5f3f-5f41, U+5f44-5f45, U+5f47-5f48, U+5f4a, U+5f4c-5f4e, U+5f50-5f51, U+5f54, U+5f56-5f58, U+5f5b-5f5d, U+5f60, U+5f63-5f65, U+5f67, U+5f6a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.42.woff2) format('woff2'); - unicode-range: U+5bbc, U+5bc0-5bc1, U+5bc3, U+5bc7, U+5bc9, U+5bcd-5bd0, U+5bd3-5bd4, U+5bd6-5bda, U+5bde, U+5be0-5be2, U+5be4-5be6, U+5be8, U+5beb-5bec, U+5bef-5bf1, U+5bf3-5bf6, U+5bfd, U+5c03, U+5c05, U+5c07-5c09, U+5c0c-5c0d, U+5c12-5c14, U+5c17, U+5c19, U+5c1e-5c20, U+5c22-5c24, U+5c26, U+5c28-5c2e, U+5c30, U+5c32, U+5c35-5c36, U+5c38-5c39, U+5c46, U+5c4d-5c50, U+5c53, U+5c59-5c5c, U+5c5f-5c63, U+5c67-5c69, U+5c6c-5c70, U+5c74-5c76, U+5c79-5c7d, U+5c87-5c88, U+5c8a, U+5c8c, U+5c8f, U+5c91-5c92, U+5c94, U+5c9d, U+5c9f-5ca0, U+5ca2-5ca3, U+5ca6-5ca8, U+5caa-5cab, U+5cad, U+5cb1-5cb2, U+5cb4-5cb7, U+5cba-5cbc, U+5cbe, U+5cc5, U+5cc7, U+5cc9, U+5ccb, U+5cd0, U+5cd2, U+5cd7, U+5cd9, U+5cdd, U+5ce6, U+5ce8-5cea, U+5ced-5cee, U+5cf1-5cf2, U+5cf4-5cf5, U+5cfa-5cfb, U+5cfd, U+5d01, U+5d06, U+5d0b, U+5d0d, U+5d10-5d12, U+5d14-5d15, U+5d17-5d1b, U+5d1d, U+5d1f-5d20, U+5d22-5d24, U+5d26-5d27, U+5d2b, U+5d31, U+5d34, U+5d39, U+5d3d, U+5d3f, U+5d42-5d43, U+5d46-5d48, U+5d4a-5d4b, U+5d4e, U+5d51-5d53, U+5d55, U+5d59, U+5d5c, U+5d5f-5d62, U+5d64, U+5d69-5d6a, U+5d6c-5d6d, U+5d6f-5d70, U+5d73, U+5d76, U+5d79-5d7a, U+5d7e-5d7f, U+5d81-5d84, U+5d87-5d88, U+5d8a, U+5d8c, U+5d90, U+5d92-5d95, U+5d97, U+5d99; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.43.woff2) format('woff2'); - unicode-range: U+598b-598e, U+5992, U+5995, U+5997, U+599b, U+599d, U+599f, U+59a3-59a4, U+59a7, U+59ad-59b0, U+59b2-59b3, U+59b7, U+59ba, U+59bc, U+59be, U+59c1, U+59c3-59c4, U+59c6, U+59c8, U+59ca, U+59cd, U+59d2, U+59d9-59da, U+59dd-59df, U+59e3-59e5, U+59e7-59e8, U+59ec, U+59ee-59ef, U+59f1-59f2, U+59f4, U+59f6-59f8, U+5a00, U+5a03-5a04, U+5a09, U+5a0c-5a0e, U+5a11-5a13, U+5a17, U+5a1a-5a1c, U+5a1e-5a1f, U+5a23-5a25, U+5a27-5a28, U+5a2a, U+5a2d, U+5a30, U+5a35-5a36, U+5a40-5a41, U+5a44-5a45, U+5a47-5a49, U+5a4c, U+5a50, U+5a55, U+5a5e, U+5a62-5a63, U+5a65, U+5a67, U+5a6a, U+5a6c-5a6d, U+5a77, U+5a7a-5a7b, U+5a7e, U+5a84, U+5a8b, U+5a90, U+5a93, U+5a96, U+5a99, U+5a9c, U+5a9e-5aa0, U+5aa2, U+5aa7, U+5aac, U+5ab1-5ab3, U+5ab5, U+5ab8, U+5aba-5abf, U+5ac2, U+5ac4, U+5ac6, U+5ac8, U+5acb, U+5acf-5ad0, U+5ad6-5ad7, U+5ada, U+5adc, U+5ae0-5ae1, U+5ae3, U+5ae5-5ae6, U+5ae9-5aea, U+5aee, U+5af0, U+5af5-5af6, U+5afa-5afb, U+5afd, U+5b00-5b01, U+5b08, U+5b0b, U+5b16-5b17, U+5b19, U+5b1b, U+5b1d, U+5b21, U+5b25, U+5b2a, U+5b2c-5b2d, U+5b30, U+5b32, U+5b34, U+5b36, U+5b38, U+5b3e, U+5b40-5b41, U+5b43, U+5b45, U+5b4b-5b4c, U+5b51-5b52, U+5b56, U+5b5a-5b5c, U+5b5e-5b5f, U+5b65, U+5b68-5b69, U+5b6e-5b71, U+5b73, U+5b75-5b76, U+5b7a, U+5b7c-5b84, U+5b86, U+5b8a-5b8b, U+5b8d-5b8e, U+5b90-5b91, U+5b93-5b94, U+5b96, U+5ba5-5ba6, U+5ba8-5ba9, U+5bac-5bad, U+5baf, U+5bb1-5bb2, U+5bb7-5bb8, U+5bba; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.44.woff2) format('woff2'); - unicode-range: U+57b3, U+57b8, U+57bd, U+57c0, U+57c3, U+57c6-57c8, U+57cc, U+57cf, U+57d2-57d7, U+57dc-57de, U+57e0-57e1, U+57e3-57e4, U+57e6-57e7, U+57e9, U+57ed, U+57f0, U+57f4-57f6, U+57f8, U+57fb, U+57fd-57ff, U+5803-5804, U+5808-580d, U+5819, U+581b, U+581d-5821, U+5826-5827, U+582d, U+582f-5830, U+5832, U+5835, U+5839, U+583d, U+583f-5840, U+5849, U+584b-584d, U+584f-5852, U+5855, U+5858-5859, U+585f, U+5861-5862, U+5864, U+5867-5868, U+586d, U+5870, U+5872, U+5878-5879, U+587c, U+587f-5881, U+5885, U+5887-588d, U+588f-5890, U+5894, U+5896, U+5898, U+589d-589e, U+58a0-58a2, U+58a6, U+58a9-58ab, U+58ae, U+58b1-58b3, U+58b8-58bc, U+58be, U+58c2-58c5, U+58c8, U+58cd-58ce, U+58d0-58da, U+58dc-58e2, U+58e4-58e5, U+58e9, U+58ec, U+58ef, U+58f3-58f4, U+58f7, U+58f9, U+58fb-58fd, U+5902, U+5905-5906, U+590a-590d, U+5910, U+5912-5914, U+5918-5919, U+591b, U+591d, U+591f, U+5921, U+5923-5925, U+5928, U+592c-592d, U+592f-5930, U+5932-5933, U+5935-5936, U+5938-5939, U+593d-593f, U+5943, U+5946, U+594e, U+5950, U+5952-5953, U+5955, U+5957-595b, U+595d-5961, U+5963, U+5967, U+5969, U+596b-596d, U+596f, U+5972, U+5975-5976, U+5978-5979, U+597b-597c, U+5981; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.45.woff2) format('woff2'); - unicode-range: U+5616-5617, U+5619, U+561b, U+5620, U+5628, U+562c, U+562f-5639, U+563b-563d, U+563f-5641, U+5643-5644, U+5646-5647, U+5649, U+564b, U+564d-5650, U+5653-5654, U+565e, U+5660-5664, U+5666, U+5669-566d, U+566f, U+5671-5672, U+5675-5676, U+5678, U+567a, U+5680, U+5684-5688, U+568a-568c, U+568f, U+5694-5695, U+5699-569a, U+569d-56a0, U+56a5-56a9, U+56ab-56ae, U+56b1-56b4, U+56b6-56b7, U+56bc, U+56be, U+56c0, U+56c2-56c3, U+56c5, U+56c8-56d1, U+56d3, U+56d7-56d9, U+56dc-56dd, U+56df, U+56e1, U+56e4-56e8, U+56eb, U+56ed-56ee, U+56f1, U+56f6-56f7, U+56f9, U+56ff-5704, U+5707-570a, U+570c-570d, U+5711, U+5713, U+5715-5716, U+5718, U+571a-571d, U+5720-5726, U+5729-572a, U+572c, U+572e-572f, U+5733-5734, U+5737-5738, U+573b, U+573d-573f, U+5745-5746, U+574c-574f, U+5751-5752, U+5759, U+575f, U+5761-5762, U+5764-5765, U+5767-5769, U+576b, U+576d-5771, U+5773-5775, U+5777, U+5779-577c, U+577e-577f, U+5781, U+5783, U+5788-5789, U+578c, U+5793-5795, U+5797, U+5799-579a, U+579c-57a1, U+57a4, U+57a7-57aa, U+57ac, U+57ae, U+57b0; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.46.woff2) format('woff2'); - unicode-range: U+543f-5440, U+5443-5444, U+5447, U+544c-544f, U+5455, U+545e, U+5462, U+5464, U+5466-5467, U+5469, U+546b-546e, U+5470-5471, U+5474-5477, U+547b, U+547f-5481, U+5483-5486, U+5488-548b, U+548d-5492, U+5495-5496, U+549c, U+549f-54a2, U+54a4, U+54a6-54af, U+54b1, U+54b7-54bc, U+54be-54bf, U+54c2-54c4, U+54c6-54c8, U+54ca, U+54cd-54ce, U+54d8, U+54e0, U+54e2, U+54e5-54e6, U+54e8-54ea, U+54ec-54ef, U+54f1, U+54f3, U+54f6, U+54fc-5501, U+5505, U+5508-5509, U+550c-550f, U+5514-5516, U+5527, U+552a-552b, U+552e, U+5532-5533, U+5535-5536, U+5538-5539, U+553b-553d, U+5540-5541, U+5544-5545, U+5547, U+5549-554a, U+554c-554d, U+5550-5551, U+5556-5558, U+555a-555e, U+5560-5561, U+5563-5564, U+5566, U+557b-5583, U+5586-5588, U+558a, U+558e-558f, U+5591-5594, U+5597, U+5599, U+559e-559f, U+55a3-55a4, U+55a8-55a9, U+55ac-55ae, U+55b2, U+55bf, U+55c1, U+55c3-55c4, U+55c6-55c7, U+55c9, U+55cb-55cc, U+55ce, U+55d1-55d4, U+55d7-55d8, U+55da-55db, U+55dd-55df, U+55e2, U+55e4, U+55e9, U+55ec, U+55ee, U+55f1, U+55f6-55f9, U+55fd-55ff, U+5605, U+5607-5608, U+560a, U+560d-5612; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.47.woff2) format('woff2'); - unicode-range: U+528d, U+5291-5298, U+529a, U+529c, U+52a4-52a7, U+52ab-52ad, U+52af-52b0, U+52b5-52b8, U+52ba-52be, U+52c0-52c1, U+52c4-52c6, U+52c8, U+52ca, U+52cc-52cd, U+52cf-52d2, U+52d4, U+52d6-52d7, U+52db-52dc, U+52de, U+52e0-52e1, U+52e3, U+52e5-52e6, U+52e8-52ea, U+52ec, U+52f0-52f1, U+52f3-52fb, U+5300-5301, U+5303, U+5306-5308, U+530a-530d, U+530f-5311, U+5313, U+5315, U+5318-531f, U+5321, U+5323-5325, U+5327-532d, U+532f-5333, U+5335, U+5338, U+533c-533e, U+5340, U+5342, U+5345-5346, U+5349, U+534b-534c, U+5359, U+535b, U+535e, U+5361, U+5363-5367, U+5369, U+536c-536e, U+5372, U+5377, U+5379-537b, U+537d-537f, U+5382-5383, U+5387-5389, U+538e, U+5393-5394, U+5396, U+5398-5399, U+539d, U+53a0-53a1, U+53a4-53a6, U+53a9-53ab, U+53ad-53b0, U+53b2, U+53b4-53b8, U+53ba, U+53bd, U+53c0-53c1, U+53c3-53c5, U+53cf, U+53d2-53d3, U+53d5, U+53da-53db, U+53dd-53e0, U+53e2, U+53e6-53e8, U+53ed-53ee, U+53f4-53f5, U+53fa, U+5401-5403, U+540b, U+540f, U+5412-5413, U+541a, U+541d-541e, U+5421, U+5424, U+5427-542a, U+542c-542f, U+5431, U+5433-5436, U+543c-543d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.48.woff2) format('woff2'); - unicode-range: U+50dd-50df, U+50e1-50e6, U+50e8-50e9, U+50ed-50f6, U+50f9-50fb, U+50fe, U+5101-5103, U+5106-5109, U+510b-510e, U+5110, U+5112, U+5114-511e, U+5121, U+5123, U+5127-5128, U+512c-512d, U+512f, U+5131, U+5133-5135, U+5137-513c, U+513f-5142, U+5147, U+514a, U+514c, U+514f, U+5152-5155, U+5157-5158, U+515f-5160, U+5162, U+5164, U+5166-5167, U+5169-516a, U+516e, U+5173-5174, U+5179, U+517b, U+517e, U+5180, U+5182-5184, U+5189, U+518b-518c, U+518e-5191, U+5193, U+5195-5196, U+5198, U+519d, U+51a1-51a4, U+51a6, U+51a9-51ab, U+51ad, U+51b0-51b3, U+51b5, U+51b8, U+51ba, U+51bc-51bf, U+51c2-51c3, U+51c5, U+51c8-51cb, U+51cf, U+51d1-51d6, U+51d8, U+51de-51e0, U+51e2, U+51e5, U+51e7, U+51e9, U+51ec-51ee, U+51f2-51f5, U+51f7, U+51fe, U+5201-5202, U+5204-5205, U+520b, U+520e, U+5212-5216, U+5218, U+5222, U+5226-5228, U+522a-522b, U+522e, U+5231-5233, U+5235, U+523c, U+5244-5245, U+5249, U+524b-524c, U+524f, U+5254-5255, U+5257-5258, U+525a, U+525c-5261, U+5266, U+5269, U+526c, U+526e, U+5271, U+5273-5274, U+5277-5279, U+527d, U+527f-5280, U+5282-5285, U+5288-528a, U+528c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.49.woff2) format('woff2'); - unicode-range: U+4f57-4f58, U+4f5a-4f5b, U+4f5d-4f5f, U+4f63-4f64, U+4f69-4f6a, U+4f6c, U+4f6e-4f71, U+4f76-4f7e, U+4f81-4f85, U+4f88-4f8a, U+4f8c, U+4f8e-4f90, U+4f92-4f94, U+4f96-4f9a, U+4f9e-4fa0, U+4fab, U+4fad, U+4faf, U+4fb2, U+4fb7, U+4fb9, U+4fbb-4fbe, U+4fc0-4fc1, U+4fc4-4fc6, U+4fc8-4fc9, U+4fcb-4fd4, U+4fd8, U+4fda-4fdc, U+4fdf-4fe0, U+4fe2, U+4fe4-4fe6, U+4fef-4ff2, U+4ff6, U+4ffc-5002, U+5004-5007, U+500a, U+500c, U+500e-5011, U+5013-5014, U+5016-5018, U+501a-501e, U+5021-5023, U+5025-502a, U+502c-502e, U+5030, U+5032-5033, U+5035, U+5039, U+503b, U+5040-5043, U+5045-5048, U+504a, U+504c, U+504e, U+5050-5053, U+5055-5057, U+5059-505a, U+505f-5060, U+5062-5063, U+5066-5067, U+506a, U+506c-506d, U+5070-5072, U+5077-5078, U+5080-5081, U+5083-5086, U+5088, U+508a, U+508e-5090, U+5092-5096, U+509a-509c, U+509e-50a3, U+50aa, U+50ad, U+50af-50b4, U+50b9-50bb, U+50bd, U+50c0, U+50c2-50c4, U+50c7, U+50c9-50ca, U+50cc, U+50ce, U+50d0-50d1, U+50d3-50d4, U+50d6, U+50d8-50d9, U+50dc; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.50.woff2) format('woff2'); - unicode-range: U+4093, U+4103, U+4105, U+4148, U+414f, U+4163, U+41b4, U+41bf, U+41e6, U+41ee, U+41f3, U+4207, U+420e, U+4264, U+4293, U+42c6, U+42d6, U+42dd, U+4302, U+432b, U+4343, U+43ee, U+43f0, U+4408, U+440c, U+4417, U+441c, U+4422, U+4453, U+445b, U+4476, U+447a, U+4491, U+44b3, U+44be, U+44d4, U+4508, U+450d, U+4525, U+4543, U+457a, U+459d, U+45b8, U+45be, U+45e5, U+45ea, U+460f-4610, U+4641, U+4665, U+46a1, U+46ae-46af, U+470c, U+471f, U+4764, U+47e6, U+47fd, U+4816, U+481e, U+4844, U+484e, U+48b5, U+49b0, U+49e7, U+49fa, U+4a04, U+4a29, U+4abc, U+4b38, U+4b3b, U+4b7e, U+4bc2, U+4bca, U+4bd2, U+4be8, U+4c17, U+4c20, U+4c38, U+4cc4, U+4cd1, U+4ce1, U+4d07, U+4d77, U+4e02, U+4e04-4e05, U+4e0c, U+4e0f-4e12, U+4e15, U+4e17, U+4e19, U+4e1e-4e1f, U+4e23-4e24, U+4e28-4e2c, U+4e2e-4e31, U+4e35-4e37, U+4e3f-4e42, U+4e44, U+4e47-4e48, U+4e4d-4e4e, U+4e51, U+4e55-4e56, U+4e58, U+4e5a-4e5c, U+4e62-4e63, U+4e68-4e69, U+4e74-4e75, U+4e79, U+4e7f, U+4e82, U+4e85, U+4e8a, U+4e8d-4e8e, U+4e96-4e99, U+4e9d-4ea0, U+4ea2, U+4ea5-4ea6, U+4ea8, U+4eaf-4eb0, U+4eb3, U+4eb6, U+4eb9, U+4ebb-4ebc, U+4ec2-4ec4, U+4ec6-4ec8, U+4ecd, U+4ed0, U+4ed7, U+4eda-4edb, U+4edd-4ee2, U+4ee8, U+4eeb, U+4eed, U+4eef, U+4ef1, U+4ef3, U+4ef5, U+4ef7, U+4efc-4f00, U+4f02-4f03, U+4f08-4f09, U+4f0b-4f0d, U+4f12, U+4f15-4f17, U+4f19, U+4f1c, U+4f2b, U+4f2e, U+4f30-4f31, U+4f33, U+4f35-4f37, U+4f39, U+4f3b, U+4f3e, U+4f40, U+4f42-4f43, U+4f48-4f49, U+4f4b-4f4c, U+4f52, U+4f54, U+4f56; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.51.woff2) format('woff2'); - unicode-range: U+3395-339b, U+339e-33a0, U+33a2-33ff, U+3402, U+3405-3406, U+3427, U+342c, U+342e, U+3468, U+346a, U+3488, U+3492, U+34b5, U+34bc, U+34c1, U+34c7, U+34db, U+351f, U+353e, U+355d-355e, U+3563, U+356e, U+35a6, U+35a8, U+35c5, U+35da, U+35de, U+35f4, U+3605, U+3614, U+364a, U+3691, U+3696, U+3699, U+36cf, U+3761-3762, U+376b-376c, U+3775, U+378d, U+37c1, U+37e2, U+37e8, U+37f4, U+37fd, U+3800, U+382f, U+3836, U+3840, U+385c, U+3861, U+38a1, U+38ad, U+38fa, U+3917, U+391a, U+396f, U+39a4, U+39b8, U+3a5c, U+3a6e, U+3a73, U+3a85, U+3ac4, U+3acb, U+3ad6-3ad7, U+3aea, U+3af3, U+3b0e, U+3b1a, U+3b1c, U+3b22, U+3b35, U+3b6d, U+3b77, U+3b87-3b88, U+3b8d, U+3ba4, U+3bb6, U+3bc3, U+3bcd, U+3bf0, U+3bf3, U+3c0f, U+3c26, U+3cc3, U+3cd2, U+3d11, U+3d1e, U+3d31, U+3d4e, U+3d64, U+3d9a, U+3dc0, U+3dcc, U+3dd4, U+3e05, U+3e3f-3e40, U+3e60, U+3e66, U+3e68, U+3e83, U+3e8a, U+3e94, U+3eda, U+3f57, U+3f72, U+3f75, U+3f77, U+3fae, U+3fb1, U+3fc9, U+3fd7, U+3fdc, U+4039, U+4058; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.52.woff2) format('woff2'); - unicode-range: U+32b5-332b, U+332d-3394; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.53.woff2) format('woff2'); - unicode-range: U+31c8-31e3, U+31f0-321e, U+3220-3230, U+3232-32b4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.54.woff2) format('woff2'); - unicode-range: U+3028-303f, U+3094-3096, U+309f-30a0, U+30ee, U+30f7-30fa, U+30ff, U+3105-312f, U+3131-3163, U+3165-318e, U+3190-31bb, U+31c0-31c7; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.55.woff2) format('woff2'); - unicode-range: U+2f14-2fd5, U+2ff0-2ffb, U+3004, U+3013, U+3016-301b, U+301e, U+3020-3027; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.56.woff2) format('woff2'); - unicode-range: U+25e4-25e6, U+2601-2603, U+2609, U+260e-260f, U+2616-2617, U+261c-261f, U+262f, U+2641, U+2660, U+2662-2664, U+2666-2668, U+266d-266e, U+2672-267d, U+26bd-26be, U+2702, U+271a, U+273d, U+2740, U+2756, U+2776-2793, U+27a1, U+2934-2935, U+29bf, U+29fa-29fb, U+2b05-2b07, U+2b1a, U+2b95, U+2e3a-2e3b, U+2e80-2e99, U+2e9b-2ef3, U+2f00-2f13; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.57.woff2) format('woff2'); - unicode-range: U+24d1-24ff, U+2503-2513, U+2515-2516, U+2518-251b, U+251d-2522, U+2524-259f, U+25a2-25ab, U+25b1, U+25b7, U+25c0-25c1, U+25c9-25ca, U+25cc, U+25d0-25d3, U+25e2-25e3; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.58.woff2) format('woff2'); - unicode-range: U+2105, U+2109-210a, U+210f, U+2116, U+2121, U+2126-2127, U+212b, U+212e, U+2135, U+213b, U+2194-2199, U+21b8-21b9, U+21c4-21c6, U+21cb-21cc, U+21d0, U+21e6-21e9, U+21f5, U+2202-2203, U+2205-2206, U+2208-220b, U+220f, U+2211, U+2213, U+2215, U+221a, U+221d, U+2220, U+2223, U+2225-2226, U+2228, U+222a-222e, U+2234-2237, U+223d, U+2243, U+2245, U+2248, U+224c, U+2260, U+2262, U+2264-2265, U+226e-226f, U+2272-2273, U+2276-2277, U+2283-2287, U+228a-228b, U+2295-2299, U+22a0, U+22a5, U+22bf, U+22da-22db, U+22ef, U+2305-2307, U+2318, U+2329-232a, U+23b0-23b1, U+23be-23cc, U+23ce, U+23da-23db, U+2423, U+2469-24d0; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.59.woff2) format('woff2'); - unicode-range: U+a1-a4, U+a6-a7, U+aa, U+ac-ad, U+b5-b6, U+b8-ba, U+bc-c8, U+ca-cc, U+ce-d5, U+d9-db, U+dd-df, U+e6, U+ee, U+f0, U+f5, U+f7, U+f9, U+fb, U+fe-102, U+110-113, U+11a-11b, U+128-12b, U+143-144, U+147-148, U+14c, U+14e-14f, U+152-153, U+168-16d, U+192, U+1a0-1a1, U+1af, U+1cd-1dc, U+1f8-1f9, U+251, U+261, U+2bb, U+2c7, U+2c9, U+2ea-2eb, U+304, U+307, U+30c, U+1e3e-1e3f, U+1ea0-1ebe, U+1ec0-1ec6, U+1ec8-1ef9, U+2011-2012, U+2016, U+2018-201a, U+201e, U+2021, U+2030, U+2033, U+2035, U+2042, U+2047, U+2051, U+2074, U+20a9, U+20ab-20ac, U+20dd-20de, U+2100; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.60.woff2) format('woff2'); - unicode-range: U+2227, U+26a0, U+2713, U+301f, U+4ff8, U+5239, U+526a, U+54fa, U+5740, U+5937, U+5993, U+59fb, U+5a3c, U+5c41, U+6028, U+626e, U+646f, U+647a, U+64b0, U+64e2, U+65a7, U+66fe, U+6727, U+6955, U+6bef, U+6f23, U+724c, U+767c, U+7a83, U+7ac4, U+7b67, U+8000, U+8471, U+8513, U+8599, U+86db, U+8718, U+87f2, U+88f3, U+8ad2, U+8e2a, U+8fa3, U+95a5, U+9798, U+9910, U+9957, U+9bab, U+9c3b, U+9daf, U+ff95; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.61.woff2) format('woff2'); - unicode-range: U+a8, U+2032, U+2261, U+2282, U+3090, U+30f1, U+339c, U+535c, U+53d9, U+56a2, U+56c1, U+5806, U+589f, U+59d0, U+5a7f, U+60e0, U+639f, U+65af, U+68fa, U+69ae, U+6d1b, U+6ef2, U+71fb, U+725d, U+7262, U+75bc, U+7768, U+7940, U+79bf, U+7bed, U+7d68, U+7dfb, U+814b, U+8207, U+83e9, U+8494, U+8526, U+8568, U+85ea, U+86d9, U+87ba, U+8861, U+887f, U+8fe6, U+9059, U+9061, U+916a, U+976d, U+97ad, U+9ece; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.62.woff2) format('woff2'); - unicode-range: U+2d9, U+21d4, U+301d, U+515c, U+52fe, U+5420, U+5750, U+5766, U+5954, U+5b95, U+5f8a, U+5f98, U+620c, U+621f, U+641c, U+66d9, U+676d, U+6775, U+67f5, U+694a, U+6a02, U+6a3a, U+6a80, U+6c23, U+6c72, U+6dcb, U+6faa, U+707c, U+71c8, U+7422, U+74e2, U+7791, U+7825, U+7a14, U+7a1c, U+7c95, U+7fc1, U+82a5, U+82db, U+8304, U+853d, U+8cd3, U+8de8, U+8f0c, U+8f3f, U+9091, U+91c7, U+929a, U+98af, U+9913; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.63.woff2) format('woff2'); - unicode-range: U+2ca-2cb, U+2229, U+2468, U+2669, U+266f, U+273f, U+4ec0, U+4f60, U+4fb6, U+5347, U+540e, U+543b, U+5b0c, U+5d4c, U+5f14, U+5f9e, U+6155, U+62d0, U+6602, U+6666, U+66f3, U+67a2, U+67ca, U+69cc, U+6d29, U+6d9b, U+6e3e, U+6f81, U+7109, U+73c0, U+73c2, U+7425, U+7435-7436, U+7525, U+7554, U+785d, U+786b, U+7ae3, U+7b94, U+7d18, U+81bf, U+8511, U+8549, U+9075, U+9640, U+98e2, U+9e9f, U+ff96; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.64.woff2) format('woff2'); - unicode-range: U+2467, U+4ece, U+4ed4, U+4f91, U+4fae, U+534d, U+53c9, U+54b3, U+586b, U+5944, U+5b78, U+5df7, U+5f77, U+6101, U+6167-6168, U+61a4, U+62d9, U+698a, U+699b, U+6a59, U+6cc4, U+6e07, U+7099, U+75d2, U+77ad, U+7953, U+7984, U+7a92, U+7baa, U+7dbb, U+817f, U+82ad, U+85e9, U+868a, U+8caa, U+8f44, U+9017, U+907c, U+908a, U+92f3, U+936e, U+9435, U+978d, U+9838, U+9a28, U+9b41, U+9ba8, U+9c57, U+9eb9; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.65.woff2) format('woff2'); - unicode-range: U+b1, U+309b, U+4e5e, U+51f1, U+5506, U+55c5, U+58cc, U+59d1, U+5c51, U+5ef7, U+6284, U+62d7, U+6689, U+673d, U+6a2b, U+6a8e, U+6a9c, U+6d63, U+6dd1, U+70b8, U+7235, U+72db, U+72f8, U+7560, U+7c9b, U+7ce7, U+7e1e, U+80af, U+82eb, U+8463, U+8499, U+85dd, U+86ee, U+8a60, U+8a6e, U+8c79, U+8e87, U+8e8a, U+8f5f, U+9010, U+918d, U+9190, U+965b, U+97fb, U+9ab8, U+9bad, U+9d3b, U+9d5c, U+9dfa, U+9e93; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.66.woff2) format('woff2'); - unicode-range: U+2020, U+3003, U+3231, U+4e9b, U+4f3d, U+4f47, U+51b6, U+51dc, U+53e1, U+5bc5, U+602f, U+60bc, U+61c9, U+633d, U+637b, U+6492, U+65fa, U+660f, U+66f0, U+6703, U+681e, U+6876, U+6893, U+6912, U+698e, U+6c7d, U+714c, U+7169, U+71d5, U+725f, U+72d7, U+745b, U+74dc, U+75e2, U+7891, U+7897, U+7dcb, U+810a, U+8218, U+8339, U+840e, U+852d, U+8823, U+8a0a, U+9089, U+919c, U+971c, U+9ad9, U+ff4a, U+ff5a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.67.woff2) format('woff2'); - unicode-range: U+2466, U+2600, U+4eab, U+4fe3, U+4ff5, U+51a5, U+51f0, U+536f, U+53d4, U+53f1, U+54a5, U+559d, U+55e3, U+58fa, U+5962, U+59ea, U+5c16, U+5cef, U+5d16, U+5f10, U+5fd6, U+6190, U+6216, U+634f, U+63bb, U+66d6, U+6756, U+6bc5, U+6e26, U+727d, U+731f, U+76f2, U+7729, U+7a7f, U+7aff, U+7c9f, U+818f, U+8236, U+82b9, U+8338, U+85aa, U+88b4, U+8b33, U+904d, U+93a7, U+96cc, U+96eb, U+9aed, U+9b8e, U+fa11; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.68.woff2) format('woff2'); - unicode-range: U+251c, U+2523, U+4e14, U+545f, U+54bd, U+553e, U+55dc, U+56da, U+589c, U+5b55, U+5bb5, U+5ce1, U+5df4, U+5eb6, U+5ec9, U+6191, U+62f7, U+6357, U+64a5, U+6591, U+65bc, U+6897, U+6e1a, U+7063, U+711a, U+721b, U+722c, U+75b9, U+75d5, U+75fa, U+7766, U+7aae, U+7b48, U+7b8b, U+7d21, U+7e55, U+7f75, U+842c, U+8910, U+8a63, U+8b39, U+8b5a, U+8cdc, U+8d74, U+907d, U+91e7, U+9306, U+96bc, U+98f4, U+9ac4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.69.woff2) format('woff2'); - unicode-range: U+2003, U+2312, U+266c, U+4f86, U+51ea, U+5243, U+5256, U+541f, U+5841, U+59dc, U+5df3, U+601c, U+60e7, U+632b, U+638c, U+64ad, U+6881, U+697c, U+69cd, U+6c50, U+6d2a, U+6fc1, U+7027, U+7058, U+70f9, U+714e, U+7345, U+751a, U+760d, U+764c, U+77db, U+7d79, U+7e8f, U+80ce, U+814e, U+81fc, U+8247, U+8278, U+85a9, U+8a03, U+90ed, U+9784, U+9801, U+984e, U+99b3, U+9bc9, U+9bdb, U+9be8, U+9e78, U+ff6b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.70.woff2) format('woff2'); - unicode-range: U+266b, U+3006, U+5176, U+5197, U+51a8, U+51c6, U+52f2, U+5614, U+5875, U+5a2f, U+5b54, U+5ce0, U+5dba, U+5deb, U+5e63, U+5f59, U+5fcc, U+6068, U+6367, U+68b6, U+6a0b, U+6b64, U+6e15, U+6eba, U+7272, U+72a0, U+7947, U+7985, U+79e6, U+79e9, U+7a3d, U+7a9f, U+7aaf, U+7b95, U+7f60, U+7f9e, U+7fe0, U+8098, U+80ba, U+8106, U+82d4, U+831c, U+87f9, U+8a1f, U+8acf, U+90c1, U+920d, U+9756, U+fe43, U+ff94; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.71.woff2) format('woff2'); - unicode-range: U+af, U+2465, U+2517, U+33a1, U+4f10, U+50c5, U+51b4, U+5384, U+5606, U+5bb0, U+5cac, U+5ee3, U+618e, U+61f2, U+62c9, U+66ab, U+66f9, U+6816, U+6960, U+6b3e, U+6f20, U+7078, U+72d0, U+73ed, U+7ad9, U+7b1b, U+7be4, U+7d62, U+7f51, U+80b4, U+80f4, U+8154, U+85fb, U+865c, U+8702, U+895f, U+8aed, U+8b90, U+8ced, U+8fbf, U+91d8, U+9418, U+9583, U+9591, U+9813, U+982c, U+9bd6, U+ff46, U+ff7f, U+ff88; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.72.woff2) format('woff2'); - unicode-range: U+4e91, U+508d, U+50e7, U+514e, U+51f6, U+5446, U+5504, U+584a, U+59a8, U+59d3, U+5a46, U+5ac9, U+6020, U+60a6, U+6148, U+621a, U+6234, U+64c1, U+6523, U+675c, U+67d1, U+6953, U+6ccc, U+6df5, U+6e13, U+6f06, U+723a, U+7325, U+74e6, U+758e, U+75ab, U+75d9, U+7a40, U+8096, U+82fa, U+8587, U+8594, U+8a6b, U+8ab9, U+8b17, U+8b83, U+937c, U+963b, U+9673, U+96db, U+9ce9, U+9f4b, U+ff67, U+ff82, U+ff93; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.73.woff2) format('woff2'); - unicode-range: U+221e, U+2514, U+51f9, U+5270, U+5449, U+5824, U+59a5, U+5a29, U+5d07, U+5e16, U+60e3, U+614c, U+6276, U+643e, U+64ab, U+6562, U+6681, U+670b, U+6734, U+67af, U+6a3d, U+6b05, U+6dc0, U+6e4a, U+7259, U+732a, U+7409, U+78a7, U+7a6b, U+8015, U+809b, U+817a, U+830e, U+837b, U+85ab, U+8a23, U+8a93, U+8b00, U+8b19, U+8b21, U+8cbf, U+8fb0, U+901d, U+91b8, U+9320, U+932c, U+9688, U+96f6, U+9df2, U+ff6a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.74.woff2) format('woff2'); - unicode-range: U+2002, U+2025, U+4f8d, U+51e1, U+51f8, U+5507, U+5598, U+58f1, U+5983, U+59ac, U+5c3c, U+5de7, U+5e7d, U+5eca, U+5f61, U+606d, U+60f9, U+636e, U+64ec, U+67da, U+67ff, U+6813, U+68f2, U+693f, U+6b6a, U+6bbb, U+6ef4, U+7092, U+717d, U+7261, U+73c8, U+7432, U+7483, U+76fe, U+7709, U+78d0, U+81a3, U+81b3, U+82af, U+8305, U+8309, U+8870, U+88fe, U+8cd1, U+8d66, U+906e, U+971e, U+9812, U+ff79, U+ff90; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.75.woff2) format('woff2'); - unicode-range: U+2464, U+2501, U+2640, U+2642, U+339d, U+4f0e, U+5091, U+50b5, U+5132, U+51cc, U+558b, U+55aa, U+585e, U+5bee, U+5dfe, U+60b6, U+62b9, U+6349, U+6566, U+6590, U+6842, U+689d, U+6a58, U+6c70, U+6ff1, U+7815, U+7881, U+7aaa, U+7bc7, U+7def, U+7fa8, U+8017, U+8036, U+8061, U+821f, U+8429, U+8ce0, U+8e74, U+9019, U+90ca, U+9162, U+932f, U+93ae, U+9644, U+990c, U+9cf3, U+ff56, U+ff6e, U+ff7e, U+ff85; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.76.woff2) format('woff2'); - unicode-range: U+2266-2267, U+4f2f, U+5208, U+5451, U+546a, U+5589, U+576a, U+5815, U+5a9a, U+5b9b, U+5c3a, U+5efb, U+5faa, U+6109, U+6643, U+6652, U+695a, U+69fd, U+6b86, U+6bb4, U+6daf, U+7089, U+70cf, U+7a00, U+7a4f, U+7b39, U+7d33, U+80e1, U+828b, U+82a6, U+86cd, U+8c8c, U+8cca, U+8df3, U+9077, U+9175, U+91dc, U+925b, U+9262, U+9271, U+92ed, U+9855, U+9905, U+9d28, U+ff3f, U+ff58, U+ff68, U+ff6d, U+ff9c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.77.woff2) format('woff2'); - unicode-range: U+2207, U+25ef, U+309c, U+4e4f, U+5146, U+51dd, U+5351, U+540a, U+5629, U+5eb5, U+5f04, U+5f13, U+60dc, U+6212, U+63b4, U+642c, U+6627, U+66a6, U+66c7, U+66fd, U+674e, U+6b96, U+6c4e, U+6df3, U+6e67, U+6f84, U+72fc, U+733f, U+7c97, U+7db1, U+7e4d, U+816b, U+82d1, U+84cb, U+854e, U+8607, U+86c7, U+871c, U+8776, U+8a89, U+8fc4, U+91a4, U+9285, U+9685, U+9903, U+9b31, U+9f13, U+ff42, U+ff74, U+ff91; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.78.woff2) format('woff2'); - unicode-range: U+4e32, U+51db, U+53a8, U+53ea, U+5609, U+5674, U+5a92, U+5e7e, U+6115, U+611a, U+62cc, U+62ed, U+63c9, U+64b9, U+64e6, U+65cb, U+6606, U+6731, U+683d, U+6afb, U+7460, U+771e, U+78ef, U+7b26, U+7b51, U+7cde, U+7d10, U+7d2f, U+7d46, U+80de, U+819c, U+84b2, U+85cd, U+865a, U+8ecc, U+9022, U+90b8, U+9192, U+9675, U+96b7, U+99ff, U+ff44, U+ff55, U+ff6c, U+ff73, U+ff75, U+ff86, U+ff8d, U+ff92, U+ffe3; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.79.woff2) format('woff2'); - unicode-range: U+25b3, U+30f5, U+4eae, U+4f46, U+4f51, U+5203, U+52ff, U+55a7, U+564c, U+565b, U+57f9, U+5805, U+5b64, U+5e06, U+5f70, U+5f90, U+60e8, U+6182, U+62f3, U+62fe, U+63aa, U+64a4, U+65d7, U+673a, U+6851, U+68cb, U+68df, U+6d1e, U+6e58, U+6e9d, U+77b3, U+7832, U+7c3f, U+7db4, U+7f70, U+80aa, U+80c6, U+8105, U+819d, U+8276, U+8679, U+8986, U+8c9d, U+8fc5, U+916c, U+9665, U+9699, U+96c0, U+9a19, U+ff8b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.80.woff2) format('woff2'); - unicode-range: U+2463, U+25a1, U+4ef0, U+5076, U+5098, U+51fd, U+5302, U+5448, U+54c9, U+570b, U+583a, U+5893, U+58a8, U+58ee, U+5949, U+5bdb, U+5f26, U+5f81, U+6052, U+6170, U+61c7, U+631f, U+635c, U+664b, U+69fb, U+6f01, U+7070, U+722a, U+745e, U+755c, U+76c6, U+78c1, U+79e4, U+7bb8, U+7d0b, U+81a8, U+82d7, U+8b5c, U+8f14, U+8fb1, U+8fbb, U+9283, U+9298, U+9a30, U+ff03, U+ff50, U+ff59, U+ff7b, U+ff8e-ff8f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.81.woff2) format('woff2'); - unicode-range: U+2010, U+2502, U+25b6, U+4f3a, U+514b, U+5265, U+52c3, U+5339, U+53ec, U+54c0, U+55b0, U+5854, U+5b8f, U+5cb3, U+5e84, U+60da, U+6247, U+6249, U+628a, U+62cd, U+65ac, U+6838, U+690e, U+6cf0, U+6f02, U+6f2c, U+6f70, U+708a, U+7434, U+75be, U+77ef, U+7c60, U+7c98, U+7d1b, U+7e2b, U+80a5, U+81e3, U+820c, U+8210, U+8475, U+862d, U+8650, U+8997, U+906d, U+91c8, U+9700, U+9727, U+9df9, U+ff3a, U+ff9a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.82.woff2) format('woff2'); - unicode-range: U+2103, U+5049, U+52b1, U+5320, U+5553, U+572d, U+58c7, U+5b5d, U+5bc2, U+5de3, U+5e61, U+5f80, U+61a9, U+67d0, U+67f4, U+6c88, U+6ca1, U+6ce5, U+6d78, U+6e9c, U+6f54, U+731b, U+73b2, U+74a7, U+74f6, U+75e9, U+7b20, U+7c8b, U+7f72, U+809d, U+8108, U+82b3, U+82bd, U+84b8, U+84c4, U+88c2, U+8ae6, U+8ef8, U+902e, U+9065, U+9326, U+935b, U+938c, U+9676, U+9694, U+96f7, U+9ed9, U+ff48, U+ff4c, U+ff81; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.83.woff2) format('woff2'); - unicode-range: U+2500, U+3008-3009, U+4ead, U+4f0f, U+4fca, U+53eb, U+543e, U+57a2, U+5cf0, U+5e8f, U+5fe0, U+61b2, U+62d8, U+6442, U+64b2, U+6589, U+659c, U+67f1, U+68c4, U+6cb8, U+6d12, U+6de1, U+6fe1, U+70c8, U+723d, U+73e0, U+7656, U+773a, U+7948, U+7b87, U+7c92, U+7d3a, U+7e1b, U+7e4a, U+819a, U+8358, U+83c5, U+84bc, U+864e, U+8912, U+8c9e, U+8d05, U+92fc, U+9396, U+98fd, U+99d2, U+ff64, U+ff7a, U+ff83; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.84.woff2) format('woff2'); - unicode-range: U+3014-3015, U+4e3c, U+5036, U+5075, U+533f, U+53e9, U+5531, U+5642, U+5984, U+59e6, U+5a01, U+5b6b, U+5c0b, U+5f25, U+6069, U+60a0, U+614e, U+62b5, U+62d2-62d3, U+6597, U+660c, U+674f, U+67cf, U+6841, U+6905, U+6cf3, U+6d32, U+6d69, U+6f64, U+716e, U+7761, U+7b52, U+7be0, U+7dbf, U+7de9, U+7f36, U+81d3, U+8302, U+8389, U+846c, U+84ee, U+8a69, U+9038, U+9d8f, U+ff47, U+ff4b, U+ff76, U+ff9b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.85.woff2) format('woff2'); - unicode-range: U+25c7, U+3007, U+504f, U+507d, U+51a0, U+52a3, U+5410, U+5510, U+559a, U+5782, U+582a, U+5c0a, U+5c3f, U+5c48, U+5f6b, U+6176, U+622f, U+6279, U+62bd, U+62dd, U+65ed, U+67b6, U+6817, U+6850, U+6d6a, U+6deb, U+6ea2, U+6edd, U+6f5c, U+72e9, U+73a9, U+7573, U+76bf, U+7950, U+7956, U+7f8a, U+7ffc, U+80a2, U+80c3, U+83ca, U+8a02, U+8a13, U+8df5, U+9375, U+983b, U+99b4, U+ff4e, U+ff71, U+ff89, U+ff97; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.86.woff2) format('woff2'); - unicode-range: U+24, U+2022, U+2212, U+221f, U+2665, U+4ecf, U+5100, U+51cd, U+52d8, U+5378, U+53f6, U+574a, U+5982, U+5996, U+5c1a, U+5e1d, U+5f84, U+609f, U+61a7, U+61f8, U+6398, U+63ee, U+6676, U+6691, U+6eb6, U+7126, U+71e5, U+7687, U+7965, U+7d17, U+80a1, U+8107, U+8266, U+85a6, U+8987, U+8ca2, U+8cab, U+8e0a, U+9042, U+95c7, U+9810, U+9867, U+98fc, U+ff52-ff54, U+ff61, U+ff77, U+ff98-ff99; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.87.woff2) format('woff2'); - unicode-range: U+b0, U+226a, U+2462, U+4e39, U+4fc3, U+4fd7, U+50be, U+50da, U+5200, U+5211, U+54f2, U+5618, U+596a, U+5b22, U+5bb4, U+5d50, U+60a3, U+63fa, U+658e, U+65e8, U+6669, U+6795, U+679d, U+67a0, U+6b3a, U+6e09, U+757f, U+7cd6, U+7dbe, U+7ffb, U+83cc, U+83f1, U+840c, U+845b, U+8846, U+8972, U+8a34, U+8a50, U+8a87, U+8edf, U+8ff0, U+90a6, U+9154, U+95a3, U+9663, U+9686, U+96c7, U+ff3c, U+ff7c, U+ff8a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.88.woff2) format('woff2'); - unicode-range: U+25bd, U+4e59, U+4ec1, U+4ff3, U+515a, U+518a, U+525b, U+5375, U+552f, U+57a3, U+5b9c, U+5c3d, U+5e3d, U+5e7b, U+5f0a, U+6094, U+6458, U+654f, U+67f3, U+6b8a, U+6bd2, U+6c37, U+6ce1, U+6e56, U+6e7f, U+6ed1, U+6ede, U+6f0f, U+70ad, U+7267, U+7363, U+786c, U+7a42, U+7db2, U+7f85, U+8178, U+829d, U+8896, U+8c5a, U+8cb0, U+8ce2, U+8ed2, U+9047, U+9177, U+970a, U+9ea6, U+ff1b, U+ff31, U+ff39, U+ff80; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.89.woff2) format('woff2'); - unicode-range: U+a5, U+4e80, U+4f34, U+4f73, U+4f75, U+511f, U+5192, U+52aa, U+53c8, U+570f, U+57cb, U+596e, U+5d8b, U+5f66, U+5fd9, U+62db, U+62f6, U+6328, U+633f, U+63a7, U+6469, U+6bbf, U+6c41, U+6c57, U+6d44, U+6dbc, U+706f, U+72c2, U+72ed, U+7551, U+75f4, U+7949, U+7e26, U+7fd4, U+8150, U+8af8, U+8b0e, U+8b72, U+8ca7, U+934b, U+9a0e, U+9a12, U+9b42, U+ff41, U+ff43, U+ff45, U+ff49, U+ff4f, U+ff62-ff63; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.90.woff2) format('woff2'); - unicode-range: U+4e18, U+4fb5, U+5104, U+52c7, U+5353, U+5374, U+53e5, U+587e, U+594f, U+5a20, U+5de1, U+5f18, U+5fcd, U+6291, U+62ab, U+6355, U+6392, U+63da, U+63e1, U+656c, U+6687, U+68b0-68b1, U+68d2, U+68da, U+6b27, U+6cbc, U+7159, U+7344, U+73cd, U+76df, U+790e, U+7cf8, U+8102, U+88c1, U+8aa0, U+8e0f, U+9178, U+92ad, U+9670, U+96c5, U+9cf4, U+9db4, U+ff3e, U+ff6f, U+ff72, U+ff78, U+ff7d, U+ff84, U+ff8c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.91.woff2) format('woff2'); - unicode-range: U+60, U+2200, U+226b, U+2461, U+517c, U+526f, U+5800, U+5b97, U+5bf8, U+5c01, U+5d29, U+5e4c, U+5e81, U+6065, U+61d0, U+667a, U+6696, U+6843, U+6c99, U+6d99, U+6ec5, U+6f22, U+6f6e, U+6fa4, U+6fef, U+71c3, U+72d9, U+7384, U+78e8, U+7a1a, U+7a32, U+7a3c, U+7adc, U+7ca7, U+7d2b, U+7dad, U+7e4b, U+80a9, U+8170, U+81ed, U+820e, U+8a17, U+8afe, U+90aa, U+914e, U+963f, U+99c4, U+9eba, U+9f3b, U+ff38; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.92.woff2) format('woff2'); - unicode-range: U+2460, U+4e5f, U+4e7e, U+4ed9, U+501f, U+502b, U+5968, U+5974, U+5ac1, U+5b99, U+5ba3, U+5be7, U+5be9, U+5c64, U+5cb8, U+5ec3, U+5f1f, U+616e, U+6297, U+62e0, U+62ec, U+6368, U+642d, U+65e6, U+6717, U+676f, U+6b04, U+732e, U+7652, U+76ca, U+76d7, U+7802, U+7e70, U+7f6a, U+8133, U+81e8, U+866b, U+878d, U+88f8, U+8a5e, U+8cdb, U+8d08, U+907a, U+90e1, U+96f2, U+9f8d, U+ff35, U+ff37, U+ff40, U+ff9d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.93.woff2) format('woff2'); - unicode-range: U+21d2, U+25ce, U+300a-300b, U+4e89, U+4e9c, U+4ea1, U+5263, U+53cc, U+5426, U+5869, U+5947, U+598a, U+5999, U+5e55, U+5e72, U+5e79, U+5fae, U+5fb9, U+602a, U+6163, U+624d, U+6749, U+6c5a, U+6cbf, U+6d45, U+6dfb, U+6e7e, U+708e, U+725b, U+7763, U+79c0, U+7bc4, U+7c89, U+7e01, U+7e2e, U+8010, U+8033, U+8c6a, U+8cc3, U+8f1d, U+8f9b, U+8fb2, U+907f, U+90f7, U+9707, U+9818, U+9b3c, U+ff0a, U+ff4d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.94.woff2) format('woff2'); - unicode-range: U+2015, U+2190, U+4e43, U+5019, U+5247, U+52e7, U+5438, U+54b2, U+55ab, U+57f7, U+5bd2, U+5e8a, U+5ef6, U+6016, U+60b2, U+6162, U+6319, U+6551, U+6607, U+66b4, U+675f, U+67d4, U+6b20, U+6b53, U+6ce3, U+719f, U+75b2, U+770b, U+7720, U+77ac, U+79d2, U+7af9, U+7d05, U+7dca, U+8056, U+80f8, U+81f3, U+8352, U+885d, U+8a70, U+8aa4, U+8cbc, U+900f, U+9084, U+91e3, U+9451, U+96c4, U+99c6, U+9ad4, U+ff70; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.95.woff2) format('woff2'); - unicode-range: U+2193, U+25b2, U+4e4b, U+516d, U+51c4, U+529f, U+52c9, U+5360, U+5442, U+5857, U+5915, U+59eb, U+5a9b, U+5c3b, U+6012, U+61b6, U+62b1, U+6311, U+6577, U+65e2, U+65ec, U+6613, U+6790, U+6cb9, U+7372, U+76ae, U+7d5e, U+7fcc, U+88ab, U+88d5, U+8caf, U+8ddd, U+8ecd, U+8f38, U+8f9e, U+8feb, U+9063, U+90f5, U+93e1, U+968a, U+968f, U+98fe, U+9ec4, U+ff1d, U+ff27, U+ff2a, U+ff36, U+ff3b, U+ff3d, U+ffe5; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.96.woff2) format('woff2'); - unicode-range: U+4e03, U+4f38, U+50b7, U+5264, U+5348, U+5371, U+585a, U+58ca, U+5951, U+59b9, U+59d4, U+5b98, U+5f8b, U+6388, U+64cd, U+65e7, U+6803, U+6b6f, U+6d66, U+6e0b, U+6ecb, U+6fc3, U+72ac, U+773c, U+77e2, U+7968, U+7a74, U+7dba, U+7dd1, U+7e3e, U+808c, U+811a, U+8179, U+8239, U+8584, U+8a0e, U+8a72, U+8b66, U+8c46, U+8f29, U+90a3, U+9234, U+96f0, U+9769, U+9774, U+9aa8, U+ff26, U+ff28, U+ff9e-ff9f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.97.woff2) format('woff2'); - unicode-range: U+7e, U+b4, U+25c6, U+2661, U+4e92, U+4eee, U+4ffa, U+5144, U+5237, U+5287, U+52b4, U+58c1, U+5bff, U+5c04, U+5c06, U+5e95, U+5f31, U+5f93, U+63c3, U+640d, U+6557, U+6614, U+662f, U+67d3, U+690d, U+6bba, U+6e6f, U+72af, U+732b, U+7518, U+7ae0, U+7ae5, U+7af6, U+822a, U+89e6, U+8a3a, U+8a98, U+8cb8, U+8de1, U+8e8d, U+95d8, U+961c, U+96a3, U+96ea, U+9bae, U+ff20, U+ff22, U+ff29, U+ff2b-ff2c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.98.woff2) format('woff2'); - unicode-range: U+25cb, U+4e71, U+4f59, U+50d5, U+520a, U+5217, U+5230, U+523a-523b, U+541b, U+5439, U+5747, U+59c9, U+5bdf, U+5c31, U+5de8, U+5e7c, U+5f69, U+6050, U+60d1, U+63cf, U+663c, U+67c4, U+6885, U+6c38, U+6d6e, U+6db2, U+6df7, U+6e2c, U+6f5f, U+7532, U+76e3-76e4, U+7701, U+793c, U+79f0, U+7a93, U+7d00, U+7de0, U+7e54, U+8328, U+8840, U+969c, U+96e8, U+9811, U+9aea, U+9b5a, U+ff24, U+ff2e, U+ff57; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.99.woff2) format('woff2'); - unicode-range: U+2191, U+505c, U+52e4, U+5305, U+535a, U+56e0, U+59bb, U+5acc, U+5b09, U+5b87, U+5c90, U+5df1, U+5e2d, U+5e33, U+5f3e, U+6298, U+6383, U+653b, U+6697, U+6804, U+6a39, U+6cca, U+6e90, U+6f2b, U+702c, U+7206, U+7236, U+7559, U+7565, U+7591, U+75c7, U+75db, U+7b4b, U+7bb1, U+7d99, U+7fbd, U+8131, U+885b, U+8b1d, U+8ff7, U+9003, U+9045, U+96a0, U+9732, U+990a, U+99d0, U+9e97, U+9f62, U+ff25, U+ff2d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.100.woff2) format('woff2'); - unicode-range: U+4e08, U+4f9d, U+5012, U+514d, U+51b7, U+5275, U+53ca, U+53f8, U+5584, U+57fc, U+5b9d, U+5bfa, U+5c3e, U+5f01, U+5fb4, U+5fd7, U+606f, U+62e1, U+6563, U+6674, U+6cb3, U+6d3e, U+6d74, U+6e1b, U+6e2f, U+718a, U+7247, U+79d8, U+7d14, U+7d66, U+7d71, U+7df4, U+7e41, U+80cc, U+8155, U+83d3, U+8a95, U+8ab2, U+8ad6, U+8ca1, U+9000, U+9006, U+9678, U+97d3, U+9808, U+98ef, U+9a5a, U+9b45, U+ff23, U+ff30; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.101.woff2) format('woff2'); - unicode-range: U+25bc, U+3012, U+4ef2, U+4f0a, U+516b, U+5373, U+539a, U+53b3, U+559c, U+56f0, U+5727, U+5742, U+5965, U+59ff, U+5bc6, U+5dfb, U+5e45, U+5ead, U+5fb3, U+6211, U+6253, U+639b, U+63a8, U+6545, U+6575, U+6628, U+672d, U+68a8, U+6bdb, U+6d25, U+707d, U+767e, U+7834, U+7b46, U+7bc9, U+8074, U+82e6, U+8349, U+8a2a, U+8d70, U+8da3, U+8fce, U+91cc, U+967d, U+97ff, U+9996, U+ff1c, U+ff2f, U+ff32, U+ff34; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.102.woff2) format('woff2'); - unicode-range: U+3d, U+5e, U+25cf, U+4e0e, U+4e5d, U+4e73, U+4e94, U+4f3c, U+5009, U+5145, U+51ac, U+5238, U+524a, U+53f3, U+547c, U+5802, U+5922, U+5a66, U+5c0e, U+5de6, U+5fd8, U+5feb, U+6797, U+685c, U+6b7b, U+6c5f-6c60, U+6cc9, U+6ce2, U+6d17, U+6e21, U+7167, U+7642, U+76db, U+8001, U+821e, U+8857, U+89d2, U+8b1b, U+8b70, U+8cb4, U+8cde, U+8f03, U+8f2a, U+968e, U+9b54, U+9e7f, U+9ebb, U+ff05, U+ff33; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.103.woff2) format('woff2'); - unicode-range: U+500d, U+5074, U+50cd, U+5175, U+52e2, U+5352, U+5354, U+53f2, U+5409, U+56fa, U+5a18, U+5b88, U+5bdd, U+5ca9, U+5f92, U+5fa9, U+60a9, U+623f, U+6483, U+653f, U+666f, U+66ae, U+66f2, U+6a21, U+6b66, U+6bcd, U+6d5c, U+796d, U+7a4d, U+7aef, U+7b56, U+7b97, U+7c4d, U+7e04, U+7fa9, U+8377, U+83dc, U+83ef, U+8535, U+8863, U+88cf, U+88dc, U+8907, U+8acb, U+90ce, U+91dd, U+ff0b, U+ff0d, U+ff19, U+ff65; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.104.woff2) format('woff2'); - unicode-range: U+4e01, U+4e21, U+4e38, U+52a9, U+547d, U+592e, U+5931, U+5b63, U+5c40, U+5dde, U+5e78, U+5efa, U+5fa1, U+604b, U+6075, U+62c5, U+632f, U+6a19, U+6c0f, U+6c11, U+6c96, U+6e05, U+70ba, U+71b1, U+7387, U+7403, U+75c5, U+77ed, U+795d, U+7b54, U+7cbe, U+7d19, U+7fa4, U+8089, U+81f4, U+8208, U+8336, U+8457, U+8a33, U+8c4a, U+8ca0, U+8ca8, U+8cc0, U+9014, U+964d, U+9803, U+983c, U+98db, U+ff17, U+ff21; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.105.woff2) format('woff2'); - unicode-range: U+25, U+25a0, U+4e26, U+4f4e, U+5341, U+56f2, U+5bbf, U+5c45, U+5c55, U+5c5e, U+5dee, U+5e9c, U+5f7c, U+6255, U+627f, U+62bc, U+65cf, U+661f, U+666e, U+66dc, U+67fb, U+6975, U+6a4b, U+6b32, U+6df1, U+6e29, U+6fc0, U+738b, U+7686, U+7a76, U+7a81, U+7c73, U+7d75, U+7dd2, U+82e5, U+82f1, U+85ac, U+888b, U+899a, U+8a31, U+8a8c, U+8ab0, U+8b58, U+904a, U+9060, U+9280, U+95b2, U+984d, U+9ce5, U+ff18; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.106.woff2) format('woff2'); - unicode-range: U+30f6, U+50ac, U+5178, U+51e6, U+5224, U+52dd, U+5883, U+5897, U+590f, U+5a5a, U+5bb3, U+5c65, U+5e03, U+5e2b, U+5e30, U+5eb7, U+6271, U+63f4, U+64ae, U+6574, U+672b, U+679a, U+6a29-6a2a, U+6ca2, U+6cc1, U+6d0b, U+713c, U+74b0, U+7981, U+7a0b, U+7bc0, U+7d1a, U+7d61, U+7fd2, U+822c, U+8996, U+89aa, U+8cac, U+8cbb, U+8d77, U+8def, U+9020, U+9152, U+9244, U+9662, U+967a, U+96e3, U+9759, U+ff16; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.107.woff2) format('woff2'); - unicode-range: U+23, U+3c, U+2192, U+4e45, U+4efb, U+4f50, U+4f8b, U+4fc2, U+5024, U+5150, U+5272, U+5370, U+53bb, U+542b, U+56db, U+56e3, U+57ce, U+5bc4, U+5bcc, U+5f71, U+60aa, U+6238, U+6280, U+629c, U+6539, U+66ff, U+670d, U+677e-677f, U+6839, U+69cb, U+6b4c, U+6bb5, U+6e96, U+6f14, U+72ec, U+7389, U+7814, U+79cb, U+79d1, U+79fb, U+7a0e, U+7d0d, U+85e4, U+8d64, U+9632, U+96e2, U+9805, U+99ac, U+ff1e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.108.woff2) format('woff2'); - unicode-range: U+2605-2606, U+301c, U+4e57, U+4fee, U+5065, U+52df, U+533b, U+5357, U+57df, U+58eb, U+58f0, U+591c, U+592a-592b, U+5948, U+5b85, U+5d0e, U+5ea7, U+5ff5, U+6025, U+63a1, U+63a5, U+63db, U+643a, U+65bd, U+671d, U+68ee, U+6982, U+6b73, U+6bd4, U+6d88, U+7570, U+7b11, U+7d76, U+8077, U+8217, U+8c37, U+8c61, U+8cc7, U+8d85, U+901f, U+962a, U+9802, U+9806, U+9854, U+98f2, U+9928, U+99c5, U+9ed2; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.109.woff2) format('woff2'); - unicode-range: U+266a, U+4f11, U+533a, U+5343, U+534a, U+53cd, U+5404, U+56f3, U+5b57-5b58, U+5bae, U+5c4a, U+5e0c, U+5e2f, U+5eab, U+5f35, U+5f79, U+614b, U+6226, U+629e, U+65c5, U+6625, U+6751, U+6821, U+6b69, U+6b8b, U+6bce, U+6c42, U+706b, U+7c21, U+7cfb, U+805e, U+80b2, U+82b8, U+843d, U+8853, U+88c5, U+8a3c, U+8a66, U+8d8a, U+8fba, U+9069, U+91cf, U+9752, U+975e, U+9999, U+ff0f-ff10, U+ff14-ff15; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.110.woff2) format('woff2'); - unicode-range: U+40, U+4e86, U+4e95, U+4f01, U+4f1d, U+4fbf, U+5099, U+5171, U+5177, U+53cb, U+53ce, U+53f0, U+5668, U+5712, U+5ba4, U+5ca1, U+5f85, U+60f3, U+653e, U+65ad, U+65e9, U+6620, U+6750, U+6761, U+6b62, U+6b74, U+6e08, U+6e80, U+7248, U+7531, U+7533, U+753a, U+77f3, U+798f, U+7f6e, U+8449, U+88fd, U+89b3, U+8a55, U+8ac7, U+8b77, U+8db3, U+8efd, U+8fd4, U+9031-9032, U+9580, U+9589, U+96d1, U+985e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.111.woff2) format('woff2'); - unicode-range: U+2b, U+d7, U+300e-300f, U+4e07, U+4e8c, U+512a, U+5149, U+518d, U+5236, U+52b9, U+52d9, U+5468, U+578b, U+57fa, U+5b8c, U+5ba2, U+5c02, U+5de5, U+5f37, U+5f62, U+623b, U+63d0, U+652f, U+672a, U+6848, U+6d41, U+7136, U+7537, U+754c, U+76f4, U+79c1, U+7ba1, U+7d44, U+7d4c, U+7dcf, U+7dda, U+7de8, U+82b1, U+897f, U+8ca9, U+8cfc, U+904e, U+9664, U+982d, U+9858, U+98a8, U+9a13, U+ff13, U+ff5c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.112.woff2) format('woff2'); - unicode-range: U+4e16, U+4e3b, U+4ea4, U+4ee4, U+4f4d, U+4f4f, U+4f55, U+4f9b, U+5317, U+5358, U+53c2, U+53e4, U+548c, U+571f, U+59cb, U+5cf6, U+5e38, U+63a2, U+63b2, U+6559, U+662d, U+679c, U+6c7a, U+72b6, U+7523, U+767d, U+770c, U+7a2e, U+7a3f, U+7a7a, U+7b2c, U+7b49, U+7d20, U+7d42, U+8003, U+8272, U+8a08, U+8aac, U+8cb7, U+8eab, U+8ee2, U+9054-9055, U+90fd, U+914d, U+91cd, U+969b, U+97f3, U+984c, U+ff06; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.113.woff2) format('woff2'); - unicode-range: U+26, U+5f, U+2026, U+203b, U+4e09, U+4eac, U+4ed5, U+4fa1, U+5143, U+5199, U+5207, U+539f, U+53e3, U+53f7, U+5411, U+5473, U+5546, U+55b6, U+5929, U+597d, U+5bb9, U+5c11, U+5c4b, U+5ddd, U+5f97, U+5fc5, U+6295, U+6301, U+6307, U+671b, U+76f8, U+78ba, U+795e, U+7d30, U+7d39, U+7d9a, U+89e3, U+8a00, U+8a73, U+8a8d, U+8a9e, U+8aad, U+8abf, U+8cea, U+8eca, U+8ffd, U+904b, U+9650, U+ff11-ff12; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.114.woff2) format('woff2'); - unicode-range: U+3e, U+3005, U+4e0d, U+4e88, U+4ecb, U+4ee3, U+4ef6, U+4fdd, U+4fe1, U+500b, U+50cf, U+5186, U+5316, U+53d7, U+540c, U+544a, U+54e1, U+5728, U+58f2, U+5973, U+5b89, U+5c71, U+5e02, U+5e97, U+5f15, U+5fc3, U+5fdc, U+601d, U+611b, U+611f, U+671f, U+6728, U+6765, U+683c, U+6b21, U+6ce8, U+6d3b, U+6d77, U+7530, U+7740, U+7acb, U+7d50, U+826f, U+8f09, U+8fbc, U+9001, U+9053, U+91ce, U+9762, U+98df; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.115.woff2) format('woff2'); - unicode-range: U+7c, U+3080, U+4ee5, U+5148, U+516c, U+521d, U+5225, U+529b, U+52a0, U+53ef, U+56de, U+56fd, U+5909, U+591a, U+5b66, U+5b9f, U+5bb6, U+5bfe, U+5e73, U+5e83, U+5ea6, U+5f53, U+6027, U+610f, U+6210, U+6240, U+660e, U+66f4, U+66f8, U+6709, U+6771, U+697d, U+69d8, U+6a5f, U+6c34, U+6cbb, U+73fe, U+756a, U+7684, U+771f, U+793a, U+7f8e, U+898f, U+8a2d, U+8a71, U+8fd1, U+9078, U+9577, U+96fb, U+ff5e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.116.woff2) format('woff2'); - unicode-range: U+a9, U+3010-3011, U+30e2, U+4e0b, U+4eca, U+4ed6, U+4ed8, U+4f53, U+4f5c, U+4f7f, U+53d6, U+540d, U+54c1, U+5730, U+5916, U+5b50, U+5c0f, U+5f8c, U+624b, U+6570, U+6587, U+6599, U+691c, U+696d, U+6cd5, U+7269, U+7279, U+7406, U+767a-767b, U+77e5, U+7d04, U+7d22, U+8005, U+80fd, U+81ea, U+8868, U+8981, U+89a7, U+901a, U+9023, U+90e8, U+91d1, U+9332, U+958b, U+96c6, U+9ad8, U+ff1a, U+ff1f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.117.woff2) format('woff2'); - unicode-range: U+4e, U+a0, U+3000, U+300c-300d, U+4e00, U+4e0a, U+4e2d, U+4e8b, U+4eba, U+4f1a, U+5165, U+5168, U+5185, U+51fa, U+5206, U+5229, U+524d, U+52d5, U+5408, U+554f, U+5831, U+5834, U+5927, U+5b9a, U+5e74, U+5f0f, U+60c5, U+65b0, U+65b9, U+6642, U+6700, U+672c, U+682a, U+6b63, U+6c17, U+7121, U+751f, U+7528, U+753b, U+76ee, U+793e, U+884c, U+898b, U+8a18, U+9593, U+95a2, U+ff01, U+ff08-ff09; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.118.woff2) format('woff2'); - unicode-range: U+21-22, U+27-2a, U+2c-3b, U+3f, U+41-4d, U+4f-5d, U+61-7b, U+7d, U+ab, U+ae, U+b2-b3, U+b7, U+bb, U+c9, U+cd, U+d6, U+d8, U+dc, U+e0-e5, U+e7-ed, U+ef, U+f1-f4, U+f6, U+f8, U+fa, U+fc-fd, U+103, U+14d, U+1b0, U+300-301, U+1ebf, U+1ec7, U+2013-2014, U+201c-201d, U+2039-203a, U+203c, U+2048-2049, U+2113, U+2122, U+65e5, U+6708, U+70b9; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.119.woff2) format('woff2'); - unicode-range: U+20, U+2027, U+3001-3002, U+3041-307f, U+3081-308f, U+3091-3093, U+3099-309a, U+309d-309e, U+30a1-30e1, U+30e3-30ed, U+30ef-30f0, U+30f2-30f4, U+30fb-30fe, U+ff0c, U+ff0e; -} -/* cyrillic */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYxQgP6lY.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYzggP6lY.woff2) format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYzwgP6lY.woff2) format('woff2'); - unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYwQgP.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.0.woff2) format('woff2'); - unicode-range: U+25ee8, U+25f23, U+25f5c, U+25fd4, U+25fe0, U+25ffb, U+2600c, U+26017, U+26060, U+260ed, U+26222, U+2626a, U+26270, U+26286, U+2634c, U+26402, U+2667e, U+266b0, U+2671d, U+268dd, U+268ea, U+26951, U+2696f, U+26999, U+269dd, U+26a1e, U+26a58, U+26a8c, U+26ab7, U+26aff, U+26c29, U+26c73, U+26c9e, U+26cdd, U+26e40, U+26e65, U+26f94, U+26ff6-26ff8, U+270f4, U+2710d, U+27139, U+273da-273db, U+273fe, U+27410, U+27449, U+27614-27615, U+27631, U+27684, U+27693, U+2770e, U+27723, U+27752, U+278b2, U+27985, U+279b4, U+27a84, U+27bb3, U+27bbe, U+27bc7, U+27c3c, U+27cb8, U+27d73, U+27da0, U+27e10, U+27eaf, U+27fb7, U+2808a, U+280bb, U+28277, U+28282, U+282f3, U+283cd, U+2840c, U+28455, U+284dc, U+2856b, U+285c8-285c9, U+286d7, U+286fa, U+28946, U+28949, U+2896b, U+28987-28988, U+289ba-289bb, U+28a1e, U+28a29, U+28a43, U+28a71, U+28a99, U+28acd, U+28add, U+28ae4, U+28bc1, U+28bef, U+28cdd, U+28d10, U+28d71, U+28dfb, U+28e0f, U+28e17, U+28e1f, U+28e36, U+28e89, U+28eeb, U+28ef6, U+28f32, U+28ff8, U+292a0, U+292b1, U+29490, U+295cf, U+2967f, U+296f0, U+29719, U+29750, U+29810, U+298c6, U+29a72, U+29d4b, U+29ddb, U+29e15, U+29e3d, U+29e49, U+29e8a, U+29ec4, U+29edb, U+29ee9, U+29fce, U+29fd7, U+2a01a, U+2a02f, U+2a082, U+2a0f9, U+2a190, U+2a2b2, U+2a38c, U+2a437, U+2a5f1, U+2a602, U+2a61a, U+2a6b2, U+2a9e6, U+2b746, U+2b751, U+2b753, U+2b75a, U+2b75c, U+2b765, U+2b776-2b777, U+2b77c, U+2b782, U+2b789, U+2b78b, U+2b78e, U+2b794, U+2b7ac, U+2b7af, U+2b7bd, U+2b7c9, U+2b7cf, U+2b7d2, U+2b7d8, U+2b7f0, U+2b80d, U+2b817, U+2b81a, U+2d544, U+2e278, U+2e569, U+2e6ea, U+2f804, U+2f80f, U+2f815, U+2f818, U+2f81a, U+2f822, U+2f828, U+2f82c, U+2f833, U+2f83f, U+2f846, U+2f852, U+2f862, U+2f86d, U+2f873, U+2f877, U+2f884, U+2f899-2f89a, U+2f8a6, U+2f8ac, U+2f8b2, U+2f8b6, U+2f8d3, U+2f8db-2f8dc, U+2f8e1, U+2f8e5, U+2f8ea, U+2f8ed, U+2f8fc, U+2f903, U+2f90b, U+2f90f, U+2f91a, U+2f920-2f921, U+2f945, U+2f947, U+2f96c, U+2f995, U+2f9d0, U+2f9de-2f9df, U+2f9f4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.1.woff2) format('woff2'); - unicode-range: U+1f235-1f23b, U+1f240-1f248, U+1f250-1f251, U+2000b, U+20089-2008a, U+200a2, U+200a4, U+200b0, U+200f5, U+20158, U+201a2, U+20213, U+2032b, U+20371, U+20381, U+203f9, U+2044a, U+20509, U+2053f, U+205b1, U+205d6, U+20611, U+20628, U+206ec, U+2074f, U+207c8, U+20807, U+2083a, U+208b9, U+2090e, U+2097c, U+20984, U+2099d, U+20a64, U+20ad3, U+20b1d, U+20b9f, U+20bb7, U+20d45, U+20d58, U+20de1, U+20e64, U+20e6d, U+20e95, U+20f5f, U+21201, U+2123d, U+21255, U+21274, U+2127b, U+212d7, U+212e4, U+212fd, U+2131b, U+21336, U+21344, U+213c4, U+2146d-2146e, U+215d7, U+21647, U+216b4, U+21706, U+21742, U+218bd, U+219c3, U+21a1a, U+21c56, U+21d2d, U+21d45, U+21d62, U+21d78, U+21d92, U+21d9c, U+21da1, U+21db7, U+21de0, U+21e33-21e34, U+21f1e, U+21f76, U+21ffa, U+2217b, U+22218, U+2231e, U+223ad, U+22609, U+226f3, U+2285b, U+228ab, U+2298f, U+22ab8, U+22b46, U+22b4f-22b50, U+22ba6, U+22c1d, U+22c24, U+22de1, U+22e42, U+22feb, U+231b6, U+231c3-231c4, U+231f5, U+23372, U+233cc, U+233d0, U+233d2-233d3, U+233d5, U+233da, U+233df, U+233e4, U+233fe, U+2344a-2344b, U+23451, U+23465, U+234e4, U+2355a, U+23594, U+235c4, U+23638-2363a, U+23647, U+2370c, U+2371c, U+2373f, U+23763-23764, U+237e7, U+237f1, U+237ff, U+23824, U+2383d, U+23a98, U+23c7f, U+23cbe, U+23cfe, U+23d00, U+23d0e, U+23d40, U+23dd3, U+23df9-23dfa, U+23f7e, U+2404b, U+24096, U+24103, U+241c6, U+241fe, U+242ee, U+243bc, U+243d0, U+24629, U+246a5, U+247f1, U+24896, U+248e9, U+24a4d, U+24b56, U+24b6f, U+24c16, U+24d14, U+24e04, U+24e0e, U+24e37, U+24e6a, U+24e8b, U+24ff2, U+2504a, U+25055, U+25122, U+251a9, U+251cd, U+251e5, U+2521e, U+2524c, U+2542e, U+2548e, U+254d9, U+2550e, U+255a7, U+2567f, U+25771, U+257a9, U+257b4, U+25874, U+259c4, U+259cc, U+259d4, U+25ad7, U+25ae3-25ae4, U+25af1, U+25bb2, U+25c4b, U+25c64, U+25da1, U+25e2e, U+25e56, U+25e62, U+25e65, U+25ec2, U+25ed8; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.2.woff2) format('woff2'); - unicode-range: U+ffd7, U+ffda-ffdc, U+ffe0-ffe2, U+ffe4, U+ffe6, U+ffe8-ffee, U+1f100-1f10c, U+1f110-1f16c, U+1f170-1f1ac, U+1f200-1f202, U+1f210-1f234; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.3.woff2) format('woff2'); - unicode-range: U+fa10, U+fa12-fa6d, U+fb00-fb04, U+fe10-fe19, U+fe30-fe42, U+fe44-fe52, U+fe54-fe66, U+fe68-fe6b, U+ff02, U+ff04, U+ff07, U+ff51, U+ff5b, U+ff5d, U+ff5f-ff60, U+ff66, U+ff69, U+ff87, U+ffa1-ffbe, U+ffc2-ffc7, U+ffca-ffcf, U+ffd2-ffd6; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.4.woff2) format('woff2'); - unicode-range: U+f92d-f959, U+f95b-f9f2, U+f9f4-fa0b, U+fa0e-fa0f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.5.woff2) format('woff2'); - unicode-range: U+9e8b-9e8c, U+9e8e-9e8f, U+9e91-9e92, U+9e95-9e96, U+9e98, U+9e9b, U+9e9d-9e9e, U+9ea4-9ea5, U+9ea8-9eaa, U+9eac-9eb0, U+9eb3-9eb5, U+9eb8, U+9ebc-9ebf, U+9ec3, U+9ec6, U+9ec8, U+9ecb-9ecd, U+9ecf-9ed1, U+9ed4-9ed5, U+9ed8, U+9edb-9ee0, U+9ee4-9ee5, U+9ee7-9ee8, U+9eec-9ef2, U+9ef4-9ef9, U+9efb-9eff, U+9f02-9f03, U+9f07-9f09, U+9f0e-9f12, U+9f14-9f17, U+9f19-9f1b, U+9f1f-9f22, U+9f26, U+9f2a-9f2c, U+9f2f, U+9f31-9f32, U+9f34, U+9f37, U+9f39-9f3a, U+9f3c-9f3f, U+9f41, U+9f43-9f47, U+9f4a, U+9f4e-9f50, U+9f52-9f58, U+9f5a, U+9f5d-9f61, U+9f63, U+9f66-9f6a, U+9f6c-9f73, U+9f75-9f77, U+9f7a, U+9f7d, U+9f7f, U+9f8f-9f92, U+9f94-9f97, U+9f99, U+9f9c-9fa3, U+9fa5, U+9fb4, U+9fbc-9fc2, U+9fc4, U+9fc6, U+9fcc, U+f900-f92c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.6.woff2) format('woff2'); - unicode-range: U+9c3e, U+9c41, U+9c43-9c4a, U+9c4e-9c50, U+9c52-9c54, U+9c56, U+9c58, U+9c5a-9c61, U+9c63, U+9c65, U+9c67-9c6b, U+9c6d-9c6e, U+9c70, U+9c72, U+9c75-9c78, U+9c7a-9c7c, U+9ce6-9ce7, U+9ceb-9cec, U+9cf0, U+9cf2, U+9cf6-9cf7, U+9cf9, U+9d02-9d03, U+9d06-9d09, U+9d0b, U+9d0e, U+9d11-9d12, U+9d15, U+9d17-9d18, U+9d1b-9d1f, U+9d23, U+9d26, U+9d2a-9d2c, U+9d2f-9d30, U+9d32-9d34, U+9d3a, U+9d3c-9d3f, U+9d41-9d48, U+9d4a, U+9d50-9d54, U+9d59, U+9d5d-9d65, U+9d69-9d6c, U+9d6f-9d70, U+9d72-9d73, U+9d76-9d77, U+9d7a-9d7c, U+9d7e, U+9d83-9d84, U+9d86-9d87, U+9d89-9d8a, U+9d8d-9d8e, U+9d92-9d93, U+9d95-9d9a, U+9da1, U+9da4, U+9da9-9dac, U+9dae, U+9db1-9db2, U+9db5, U+9db8-9dbd, U+9dbf-9dc4, U+9dc6-9dc7, U+9dc9-9dca, U+9dcf, U+9dd3-9dd7, U+9dd9-9dda, U+9dde-9de0, U+9de3, U+9de5-9de7, U+9de9, U+9deb, U+9ded-9df0, U+9df3-9df4, U+9df8, U+9dfd-9dfe, U+9e02, U+9e07, U+9e0a, U+9e0d-9e0e, U+9e10-9e12, U+9e15-9e16, U+9e19-9e1f, U+9e75, U+9e79-9e7d, U+9e80-9e85, U+9e87-9e88; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.7.woff2) format('woff2'); - unicode-range: U+9ae5-9ae7, U+9ae9, U+9aeb-9aec, U+9aee-9aef, U+9af1-9af5, U+9af7, U+9af9-9afb, U+9afd, U+9aff-9b06, U+9b08-9b09, U+9b0b-9b0e, U+9b10, U+9b12, U+9b16, U+9b18-9b1d, U+9b1f-9b20, U+9b22-9b23, U+9b25-9b2f, U+9b32-9b35, U+9b37, U+9b39-9b3b, U+9b3d, U+9b43-9b44, U+9b48, U+9b4b-9b4f, U+9b51, U+9b55-9b58, U+9b5b, U+9b5e, U+9b61, U+9b63, U+9b65-9b66, U+9b68, U+9b6a-9b6f, U+9b72-9b79, U+9b7f-9b80, U+9b83-9b87, U+9b89-9b8b, U+9b8d, U+9b8f-9b94, U+9b96-9b97, U+9b9a, U+9b9d-9ba0, U+9ba6-9ba7, U+9ba9-9baa, U+9bac, U+9bb0-9bb2, U+9bb4, U+9bb7-9bb9, U+9bbb-9bbc, U+9bbe-9bc1, U+9bc6-9bc8, U+9bca, U+9bce-9bd2, U+9bd4, U+9bd7-9bd8, U+9bdd, U+9bdf, U+9be1-9be5, U+9be7, U+9bea-9beb, U+9bee-9bf3, U+9bf5, U+9bf7-9bfa, U+9bfd, U+9bff-9c00, U+9c02, U+9c04, U+9c06, U+9c08-9c0d, U+9c0f-9c16, U+9c18-9c1e, U+9c21-9c2a, U+9c2d-9c32, U+9c35-9c37, U+9c39-9c3a, U+9c3d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.8.woff2) format('woff2'); - unicode-range: U+98eb, U+98ed-98ee, U+98f0-98f1, U+98f3, U+98f6, U+9902, U+9907-9909, U+9911-9912, U+9914-9918, U+991a-9922, U+9924, U+9926-9927, U+992b-992c, U+992e, U+9931-9935, U+9939-993e, U+9940-9942, U+9945-9949, U+994b-994e, U+9950-9952, U+9954-9955, U+9958-9959, U+995b-995c, U+995e-9960, U+9963, U+9997-9998, U+999b, U+999d-999f, U+99a3, U+99a5-99a6, U+99a8, U+99ad-99ae, U+99b0-99b2, U+99b5, U+99b9-99ba, U+99bc-99bd, U+99bf, U+99c1, U+99c3, U+99c8-99c9, U+99d1, U+99d3-99d5, U+99d8-99df, U+99e1-99e2, U+99e7, U+99ea-99ee, U+99f0-99f2, U+99f4-99f5, U+99f8-99f9, U+99fb-99fe, U+9a01-9a05, U+9a08, U+9a0a-9a0c, U+9a0f-9a11, U+9a16, U+9a1a, U+9a1e, U+9a20, U+9a22-9a24, U+9a27, U+9a2b, U+9a2d-9a2e, U+9a31, U+9a33, U+9a35-9a38, U+9a3e, U+9a40-9a45, U+9a47, U+9a4a-9a4e, U+9a51-9a52, U+9a54-9a58, U+9a5b, U+9a5d, U+9a5f, U+9a62, U+9a64-9a65, U+9a69-9a6c, U+9aaa, U+9aac-9ab0, U+9ab2, U+9ab4-9ab7, U+9ab9, U+9abb-9ac1, U+9ac3, U+9ac6, U+9ac8, U+9ace-9ad3, U+9ad5-9ad7, U+9adb-9adc, U+9ade-9ae0, U+9ae2-9ae4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.9.woff2) format('woff2'); - unicode-range: U+971d, U+9721-9724, U+9728, U+972a, U+9730-9731, U+9733, U+9736, U+9738-9739, U+973b, U+973d-973e, U+9741-9744, U+9746-974a, U+974d-974f, U+9751, U+9755, U+9757-9758, U+975a-975c, U+9760-9761, U+9763-9764, U+9766-9768, U+976a-976b, U+976e, U+9771, U+9773, U+9776-977d, U+977f-9781, U+9785-9786, U+9789, U+978b, U+978f-9790, U+9795-9797, U+9799-979a, U+979c, U+979e-97a0, U+97a2-97a3, U+97a6, U+97a8, U+97ab-97ac, U+97ae, U+97b1-97b6, U+97b8-97ba, U+97bc, U+97be-97bf, U+97c1, U+97c3-97ce, U+97d0-97d1, U+97d4, U+97d7-97d9, U+97db-97de, U+97e0-97e1, U+97e4, U+97e6, U+97ed-97ef, U+97f1-97f2, U+97f4-97f8, U+97fa, U+9804, U+9807, U+980a, U+980c-980f, U+9814, U+9816-9817, U+9819-981a, U+981c, U+981e, U+9820-9821, U+9823-9826, U+982b, U+982e-9830, U+9832-9835, U+9837, U+9839, U+983d-983e, U+9844, U+9846-9847, U+984a-984b, U+984f, U+9851-9853, U+9856-9857, U+9859-985b, U+9862-9863, U+9865-9866, U+986a-986c, U+986f-9871, U+9873-9875, U+98aa-98ab, U+98ad-98ae, U+98b0-98b1, U+98b4, U+98b6-98b8, U+98ba-98bc, U+98bf, U+98c2-98c8, U+98cb-98cc, U+98ce, U+98dc, U+98de, U+98e0-98e1, U+98e3, U+98e5-98e7, U+98e9-98ea; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.10.woff2) format('woff2'); - unicode-range: U+944a, U+944c, U+9452-9453, U+9455, U+9459-945c, U+945e-9463, U+9468, U+946a-946b, U+946d-9472, U+9475, U+9477, U+947c-947f, U+9481, U+9483-9485, U+9578-9579, U+957e-957f, U+9582, U+9584, U+9586-9588, U+958a, U+958c-958f, U+9592, U+9594, U+9596, U+9598-9599, U+959d-95a1, U+95a4, U+95a6-95a9, U+95ab-95ad, U+95b1, U+95b4, U+95b6, U+95b9-95bf, U+95c3, U+95c6, U+95c8-95cd, U+95d0-95d6, U+95d9-95da, U+95dc-95e2, U+95e4-95e6, U+95e8, U+961d-961e, U+9621-9622, U+9624-9626, U+9628, U+962c, U+962e-962f, U+9631, U+9633-9634, U+9637-963a, U+963c-963d, U+9641-9642, U+964b-964c, U+964f, U+9652, U+9654, U+9656-9658, U+965c-965f, U+9661, U+9666, U+966a, U+966c, U+966e, U+9672, U+9674, U+9677, U+967b-967c, U+967e-967f, U+9681-9684, U+9689, U+968b, U+968d, U+9691, U+9695-9698, U+969a, U+969d, U+969f, U+96a4-96aa, U+96ae-96b4, U+96b6, U+96b8-96bb, U+96bd, U+96c1, U+96c9-96cb, U+96cd-96ce, U+96d2, U+96d5-96d6, U+96d8-96da, U+96dc-96df, U+96e9, U+96ef, U+96f1, U+96f9-96fa, U+9702-9706, U+9708-9709, U+970d-970f, U+9711, U+9713-9714, U+9716, U+9719-971b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.11.woff2) format('woff2'); - unicode-range: U+92bc-92bd, U+92bf-92c3, U+92c5-92c8, U+92cb-92d0, U+92d2-92d3, U+92d5, U+92d7-92d9, U+92dc-92dd, U+92df-92e1, U+92e3-92e5, U+92e7-92ea, U+92ec, U+92ee, U+92f0, U+92f2, U+92f7-92fb, U+92ff-9300, U+9302, U+9304, U+9308, U+930d, U+930f-9311, U+9314-9315, U+9318-931a, U+931c-931f, U+9321-9325, U+9327-932b, U+932e, U+9333-9337, U+933a-933b, U+9344, U+9347-934a, U+934d, U+9350-9352, U+9354-9358, U+935a, U+935c, U+935e, U+9360, U+9364-9365, U+9367, U+9369-936d, U+936f-9371, U+9373-9374, U+9376, U+937a, U+937d-9382, U+9388, U+938a-938b, U+938d, U+938f, U+9392, U+9394-9395, U+9397-9398, U+939a-939b, U+939e, U+93a1, U+93a3-93a4, U+93a6, U+93a8-93a9, U+93ab-93ad, U+93b0, U+93b4-93b6, U+93b9-93bb, U+93c1, U+93c3-93cd, U+93d0-93d1, U+93d3, U+93d6-93d9, U+93dc-93df, U+93e2, U+93e4-93e8, U+93f1, U+93f5, U+93f7-93fb, U+93fd, U+9401-9404, U+9407-9409, U+940d-9410, U+9413-9417, U+9419-941a, U+941f, U+9421, U+942b, U+942e-942f, U+9431-9434, U+9436, U+9438, U+943a-943b, U+943d, U+943f, U+9441, U+9443-9445, U+9448; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.12.woff2) format('woff2'); - unicode-range: U+9143, U+9146-914c, U+914f, U+9153, U+9156-915b, U+9161, U+9163-9165, U+9167, U+9169, U+916d, U+9172-9174, U+9179-917b, U+9181-9183, U+9185-9187, U+9189-918b, U+918e, U+9191, U+9193-9195, U+9197-9198, U+919e, U+91a1-91a2, U+91a6, U+91a8, U+91aa-91b6, U+91ba-91bd, U+91bf-91c6, U+91c9, U+91cb, U+91d0, U+91d3-91d4, U+91d6-91d7, U+91d9-91db, U+91de-91df, U+91e1, U+91e4-91e6, U+91e9-91ea, U+91ec-91f1, U+91f5-91f7, U+91f9, U+91fb-91fd, U+91ff-9201, U+9204-9207, U+9209-920a, U+920c, U+920e, U+9210-9218, U+921c-921e, U+9223-9226, U+9228-9229, U+922c, U+922e-9230, U+9233, U+9235-923a, U+923c, U+923e-9240, U+9242-9243, U+9245-924b, U+924d-9251, U+9256-925a, U+925c-925e, U+9260-9261, U+9264-9269, U+926e-9270, U+9275-9279, U+927b-927f, U+9288-928a, U+928d-928e, U+9291-9293, U+9295-9297, U+9299, U+929b-929c, U+929f-92a0, U+92a4-92a5, U+92a7-92a8, U+92ab, U+92af, U+92b2-92b3, U+92b6-92bb; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.13.woff2) format('woff2'); - unicode-range: U+8f52-8f55, U+8f57-8f58, U+8f5c-8f5e, U+8f61-8f66, U+8f9c-8f9d, U+8f9f-8fa2, U+8fa4-8fa8, U+8fad-8faf, U+8fb4-8fb8, U+8fbe, U+8fc0-8fc2, U+8fc6, U+8fc8, U+8fca-8fcb, U+8fcd, U+8fd0, U+8fd2-8fd3, U+8fd5, U+8fda, U+8fe0, U+8fe2-8fe5, U+8fe8-8fea, U+8fed-8fef, U+8ff1, U+8ff4-8ff6, U+8ff8-8ffb, U+8ffe, U+9002, U+9004-9005, U+9008, U+900b-900e, U+9011, U+9013, U+9015-9016, U+9018, U+901b, U+901e, U+9021, U+9027-902a, U+902c-902d, U+902f, U+9033-9037, U+9039, U+903c, U+903e-903f, U+9041, U+9043-9044, U+9049, U+904c, U+904f-9052, U+9056, U+9058, U+905b-905e, U+9062, U+9066-9068, U+906c, U+906f-9070, U+9072, U+9074, U+9076, U+9079, U+9080-9083, U+9085, U+9087-9088, U+908b-908c, U+908e-9090, U+9095, U+9097-9099, U+909b, U+90a0-90a2, U+90a5, U+90a8, U+90af-90b6, U+90bd-90be, U+90c3-90c5, U+90c7-90c9, U+90cc, U+90d2, U+90d5, U+90d7-90d9, U+90db-90df, U+90e2, U+90e4-90e5, U+90eb, U+90ef-90f0, U+90f2, U+90f4, U+90f6, U+90fe-9100, U+9102, U+9104-9106, U+9108, U+910d, U+9110, U+9112, U+9114-911a, U+911c, U+911e, U+9120, U+9122-9123, U+9125, U+9127, U+9129, U+912d-9132, U+9134, U+9136-9137, U+9139-913a, U+913c-913d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.14.woff2) format('woff2'); - unicode-range: U+8dc0, U+8dc2, U+8dc5-8dc8, U+8dca-8dcc, U+8dce-8dcf, U+8dd1, U+8dd4-8dd7, U+8dd9-8ddb, U+8ddf, U+8de3-8de5, U+8de7, U+8dea-8dec, U+8df0-8df2, U+8df4, U+8dfc-8dfd, U+8dff, U+8e01, U+8e04-8e06, U+8e08-8e09, U+8e0b-8e0c, U+8e10-8e11, U+8e14, U+8e16, U+8e1d-8e23, U+8e26-8e27, U+8e30-8e31, U+8e33-8e39, U+8e3d, U+8e40-8e42, U+8e44, U+8e47-8e50, U+8e54-8e55, U+8e59, U+8e5b-8e64, U+8e69, U+8e6c-8e6d, U+8e6f-8e72, U+8e75-8e77, U+8e79-8e7c, U+8e81-8e85, U+8e89, U+8e8b, U+8e90-8e95, U+8e98-8e9b, U+8e9d-8e9e, U+8ea1-8ea2, U+8ea7, U+8ea9-8eaa, U+8eac-8eb1, U+8eb3, U+8eb5-8eb6, U+8eba-8ebb, U+8ebe, U+8ec0-8ec1, U+8ec3-8ec8, U+8ecb, U+8ecf, U+8ed1, U+8ed4, U+8edb-8edc, U+8ee3, U+8ee8, U+8eeb, U+8eed-8eee, U+8ef0-8ef1, U+8ef7, U+8ef9-8efc, U+8efe, U+8f00, U+8f02, U+8f05, U+8f07-8f08, U+8f0a, U+8f0f-8f10, U+8f12-8f13, U+8f15-8f19, U+8f1b-8f1c, U+8f1e-8f21, U+8f23, U+8f25-8f28, U+8f2b-8f2f, U+8f33-8f37, U+8f39-8f3b, U+8f3e, U+8f40-8f43, U+8f45-8f47, U+8f49-8f4a, U+8f4c-8f4f, U+8f51; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.15.woff2) format('woff2'); - unicode-range: U+8b2d, U+8b30, U+8b37, U+8b3c, U+8b3e, U+8b41-8b46, U+8b48-8b49, U+8b4c-8b4f, U+8b51-8b54, U+8b56, U+8b59, U+8b5b, U+8b5e-8b5f, U+8b63, U+8b69, U+8b6b-8b6d, U+8b6f, U+8b71, U+8b74, U+8b76, U+8b78-8b79, U+8b7c-8b81, U+8b84-8b85, U+8b8a-8b8f, U+8b92-8b96, U+8b99-8b9a, U+8b9c-8ba0, U+8c38-8c3a, U+8c3d-8c3f, U+8c41, U+8c45, U+8c47-8c49, U+8c4b-8c4c, U+8c4e-8c51, U+8c53-8c55, U+8c57-8c59, U+8c5b, U+8c5d, U+8c62-8c64, U+8c66, U+8c68-8c69, U+8c6b-8c6d, U+8c73, U+8c75-8c76, U+8c78, U+8c7a-8c7c, U+8c7e, U+8c82, U+8c85-8c87, U+8c89-8c8b, U+8c8d-8c8e, U+8c90, U+8c92-8c94, U+8c98-8c99, U+8c9b-8c9c, U+8c9f, U+8ca4, U+8cad-8cae, U+8cb2-8cb3, U+8cb6, U+8cb9-8cba, U+8cbd, U+8cc1-8cc2, U+8cc4-8cc6, U+8cc8-8cc9, U+8ccb, U+8ccd-8ccf, U+8cd2, U+8cd5-8cd6, U+8cd9-8cda, U+8cdd, U+8ce1, U+8ce3-8ce4, U+8ce6, U+8ce8, U+8cec, U+8cef-8cf2, U+8cf4-8cf5, U+8cf7-8cf8, U+8cfa-8cfb, U+8cfd-8cff, U+8d01, U+8d03-8d04, U+8d07, U+8d09-8d0b, U+8d0d-8d10, U+8d12-8d14, U+8d16-8d17, U+8d1b-8d1d, U+8d65, U+8d67, U+8d69, U+8d6b-8d6e, U+8d71, U+8d73, U+8d76, U+8d7f, U+8d81-8d82, U+8d84, U+8d88, U+8d8d, U+8d90-8d91, U+8d95, U+8d99, U+8d9e-8da0, U+8da6, U+8da8, U+8dab-8dac, U+8daf, U+8db2, U+8db5, U+8db7, U+8db9-8dbc, U+8dbe; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.16.woff2) format('woff2'); - unicode-range: U+8973-8975, U+8977, U+897a-897e, U+8980, U+8983, U+8988-898a, U+898d, U+8990, U+8993-8995, U+8998, U+899b-899c, U+899f-89a1, U+89a5-89a6, U+89a9, U+89ac, U+89af-89b0, U+89b2, U+89b4-89b7, U+89ba, U+89bc-89bd, U+89bf-89c1, U+89d4-89d8, U+89da, U+89dc-89dd, U+89e5, U+89e7, U+89e9, U+89eb, U+89ed, U+89f1, U+89f3-89f4, U+89f6, U+89f8-89f9, U+89fd, U+89ff, U+8a01, U+8a04-8a05, U+8a07, U+8a0c, U+8a0f-8a12, U+8a14-8a16, U+8a1b, U+8a1d-8a1e, U+8a20-8a22, U+8a24-8a26, U+8a2b-8a2c, U+8a2f, U+8a35-8a37, U+8a3b, U+8a3d-8a3e, U+8a40-8a41, U+8a43, U+8a45-8a49, U+8a4d-8a4e, U+8a51-8a54, U+8a56-8a58, U+8a5b-8a5d, U+8a61-8a62, U+8a65, U+8a67, U+8a6c-8a6d, U+8a75-8a77, U+8a79-8a7c, U+8a7e-8a80, U+8a82-8a86, U+8a8b, U+8a8f-8a92, U+8a96-8a97, U+8a99-8a9a, U+8a9f, U+8aa1, U+8aa3, U+8aa5-8aaa, U+8aae-8aaf, U+8ab3, U+8ab6-8ab7, U+8abb-8abc, U+8abe, U+8ac2-8ac4, U+8ac6, U+8ac8-8aca, U+8acc-8acd, U+8ad0-8ad1, U+8ad3-8ad5, U+8ad7, U+8ada-8ae2, U+8ae4, U+8ae7, U+8aeb-8aec, U+8aee, U+8af0-8af1, U+8af3-8af7, U+8afa, U+8afc, U+8aff, U+8b01-8b02, U+8b04-8b07, U+8b0a-8b0d, U+8b0f-8b11, U+8b14, U+8b16, U+8b1a, U+8b1c, U+8b1e-8b20, U+8b26, U+8b28, U+8b2b-8b2c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.17.woff2) format('woff2'); - unicode-range: U+87e2-87e6, U+87ea-87ed, U+87ef, U+87f1, U+87f3, U+87f5-87f8, U+87fa-87fb, U+87fe-87ff, U+8801, U+8803, U+8805-8807, U+8809-880b, U+880d-8816, U+8818-881c, U+881e-881f, U+8821-8822, U+8827-8828, U+882d-882e, U+8830-8832, U+8835-8836, U+8839-883c, U+8841-8845, U+8848-884b, U+884d-884e, U+8851-8852, U+8855-8856, U+8858-885a, U+885c, U+885e-8860, U+8862, U+8864, U+8869, U+886b, U+886e-886f, U+8871-8872, U+8875, U+8877, U+8879, U+887b, U+887d-887e, U+8880-8882, U+8888, U+888d, U+8892, U+8897-889c, U+889e-88a0, U+88a2, U+88a4, U+88a8, U+88aa, U+88ae, U+88b0-88b1, U+88b5, U+88b7, U+88ba, U+88bc-88c0, U+88c3-88c4, U+88c6, U+88ca-88ce, U+88d1-88d4, U+88d8-88d9, U+88db, U+88dd-88e1, U+88e7-88e8, U+88ef-88f2, U+88f4-88f5, U+88f7, U+88f9, U+88fc, U+8901-8902, U+8904, U+8906, U+890a, U+890c-890f, U+8913, U+8915-8916, U+8918-891a, U+891c-891e, U+8920, U+8925-8928, U+892a-892b, U+8930-8932, U+8935-893b, U+893e, U+8940-8946, U+8949, U+894c-894d, U+894f, U+8952, U+8956-8957, U+895a-895c, U+895e, U+8960-8964, U+8966, U+896a-896b, U+896d-8970; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.18.woff2) format('woff2'); - unicode-range: U+8655-8659, U+865b, U+865d-8664, U+8667, U+8669, U+866c, U+866f, U+8671, U+8675-8677, U+867a-867b, U+867d, U+8687-8689, U+868b-868d, U+8691, U+8693, U+8695-8696, U+8698, U+869a, U+869c-869d, U+86a1, U+86a3-86a4, U+86a6-86ab, U+86ad, U+86af-86b1, U+86b3-86b9, U+86bf-86c1, U+86c3-86c6, U+86c9, U+86cb, U+86ce, U+86d1-86d2, U+86d4-86d5, U+86d7, U+86da, U+86dc, U+86de-86e0, U+86e3-86e7, U+86e9, U+86ec-86ed, U+86ef, U+86f8-86fe, U+8700, U+8703-870b, U+870d-8714, U+8719-871a, U+871e-871f, U+8721-8723, U+8725, U+8728-8729, U+872e-872f, U+8731-8732, U+8734, U+8737, U+8739-8740, U+8743, U+8745, U+8749, U+874b-874e, U+8751, U+8753, U+8755, U+8757-8759, U+875d, U+875f-8761, U+8763-8766, U+8768, U+876a, U+876e-876f, U+8771-8772, U+8774, U+8778, U+877b-877c, U+877f, U+8782-8789, U+878b-878c, U+878e, U+8790, U+8793, U+8795, U+8797-8799, U+879e-87a0, U+87a2-87a3, U+87a7, U+87ab-87af, U+87b1, U+87b3, U+87b5, U+87bb, U+87bd-87c1, U+87c4, U+87c6-87cb, U+87ce, U+87d0, U+87d2, U+87d5-87d6, U+87d9-87da, U+87dc, U+87df-87e0; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.19.woff2) format('woff2'); - unicode-range: U+84b4, U+84b9-84bb, U+84bd-84c2, U+84c6-84ca, U+84cc-84d1, U+84d3, U+84d6, U+84d9-84da, U+84dc, U+84e7, U+84ea, U+84ec, U+84ef-84f2, U+84f4, U+84f7, U+84fa-84fd, U+84ff-8500, U+8502-8503, U+8506-8507, U+850c, U+850e, U+8510, U+8514-8515, U+8517-8518, U+851a-851c, U+851e-851f, U+8521-8525, U+8527, U+852a-852c, U+852f, U+8532-8534, U+8536, U+853e-8541, U+8543, U+8546, U+8548, U+854a-854b, U+854f-8553, U+8555-855a, U+855c-8564, U+8569-856b, U+856d, U+856f, U+8577, U+8579-857b, U+857d-8581, U+8585-8586, U+8588-858c, U+858f-8591, U+8593, U+8597-8598, U+859b-859d, U+859f-85a0, U+85a2, U+85a4-85a5, U+85a7-85a8, U+85ad-85b0, U+85b4, U+85b6-85ba, U+85bc-85bf, U+85c1-85c2, U+85c7, U+85c9-85cb, U+85ce-85d0, U+85d5, U+85d8-85da, U+85dc, U+85df-85e1, U+85e5-85e6, U+85e8, U+85ed, U+85f3-85f4, U+85f6-85f7, U+85f9-85fa, U+85fc, U+85fe-8600, U+8602, U+8604-8606, U+860a-860b, U+860d-860e, U+8610-8613, U+8616-861b, U+861e, U+8621-8622, U+8624, U+8627, U+8629, U+862f-8630, U+8636, U+8638-863a, U+863c-863d, U+863f-8642, U+8646, U+864d, U+8652-8654; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.20.woff2) format('woff2'); - unicode-range: U+82e8, U+82ea, U+82ed, U+82ef, U+82f3-82f4, U+82f6-82f7, U+82f9, U+82fb, U+82fd-82fe, U+8300-8301, U+8303, U+8306-8308, U+830a-830c, U+8316-8318, U+831b, U+831d-831f, U+8321-8323, U+832b-8335, U+8337, U+833a, U+833c-833d, U+8340, U+8342-8347, U+834a, U+834d-8351, U+8353-8357, U+835a, U+8362-8363, U+8370, U+8373, U+8375, U+8378, U+837c-837d, U+837f-8380, U+8382, U+8384-8387, U+838a, U+838d-838e, U+8392-8396, U+8398-83a0, U+83a2, U+83a6-83ad, U+83b1, U+83b5, U+83bd-83c1, U+83c7, U+83c9, U+83ce-83d1, U+83d4, U+83d6, U+83d8, U+83dd, U+83df-83e1, U+83e5, U+83e8, U+83ea-83eb, U+83f0, U+83f2, U+83f4, U+83f6-83f9, U+83fb-83fd, U+8401, U+8403-8404, U+8406-8407, U+840a-840b, U+840d, U+840f, U+8411, U+8413, U+8415, U+8417, U+8419, U+8420, U+8422, U+842a, U+842f, U+8431, U+8435, U+8438-8439, U+843c, U+8445-8448, U+844a, U+844d-844f, U+8451-8452, U+8456, U+8458-845a, U+845c, U+845f-8462, U+8464-8467, U+8469-846b, U+846d-8470, U+8473-8474, U+8476-847a, U+847c-847d, U+8481-8482, U+8484-8485, U+848b, U+8490, U+8492-8493, U+8495, U+8497, U+849c, U+849e-849f, U+84a1, U+84a6, U+84a8-84aa, U+84ad, U+84af, U+84b1; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.21.woff2) format('woff2'); - unicode-range: U+814a, U+814c, U+8151-8153, U+8157, U+815f-8161, U+8165-8169, U+816d-816f, U+8171, U+8173-8174, U+8177, U+8180-8186, U+8188, U+818a-818b, U+818e, U+8190, U+8193, U+8195-8196, U+8198, U+819b, U+819e, U+81a0, U+81a2, U+81a4, U+81a9, U+81ae, U+81b0, U+81b2, U+81b4-81b5, U+81b8, U+81ba-81bb, U+81bd-81be, U+81c0-81c3, U+81c5-81c6, U+81c8-81cb, U+81cd-81cf, U+81d1, U+81d5-81db, U+81dd-81e1, U+81e4-81e5, U+81e7, U+81eb-81ec, U+81ef-81f2, U+81f5-81f6, U+81f8-81fb, U+81fd-8205, U+8209-820b, U+820d, U+820f, U+8212-8214, U+8216, U+8219-821d, U+8221-8222, U+8228-8229, U+822b, U+822e, U+8232-8235, U+8237-8238, U+823a, U+823c, U+8240, U+8243-8246, U+8249, U+824b, U+824e-824f, U+8251, U+8256-825a, U+825c-825d, U+825f-8260, U+8262-8264, U+8267-8268, U+826a-826b, U+826d-826e, U+8271, U+8274, U+8277, U+8279, U+827b, U+827d-8281, U+8283-8284, U+8287, U+8289-828a, U+828d-828e, U+8291-8294, U+8296, U+8298-829b, U+829f-82a1, U+82a3-82a4, U+82a7-82ac, U+82ae, U+82b0, U+82b2, U+82b4, U+82b7, U+82ba-82bc, U+82be-82bf, U+82c5-82c6, U+82d0, U+82d2-82d3, U+82d5, U+82d9-82da, U+82dc, U+82de-82e4, U+82e7; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.22.woff2) format('woff2'); - unicode-range: U+7f77-7f79, U+7f7d-7f80, U+7f82-7f83, U+7f86-7f88, U+7f8b-7f8d, U+7f8f-7f91, U+7f94, U+7f96-7f97, U+7f9a, U+7f9c-7f9d, U+7fa1-7fa3, U+7fa6, U+7faa, U+7fad-7faf, U+7fb2, U+7fb4, U+7fb6, U+7fb8-7fb9, U+7fbc, U+7fbf-7fc0, U+7fc3, U+7fc5-7fc6, U+7fc8, U+7fca, U+7fce-7fcf, U+7fd5, U+7fdb, U+7fdf, U+7fe1, U+7fe3, U+7fe5-7fe6, U+7fe8-7fe9, U+7feb-7fec, U+7fee-7ff0, U+7ff2-7ff3, U+7ff9-7ffa, U+7ffd-7fff, U+8002, U+8004, U+8006-8008, U+800a-800f, U+8011-8014, U+8016, U+8018-8019, U+801c-8021, U+8024, U+8026, U+8028, U+802c, U+802e, U+8030, U+8034-8035, U+8037, U+8039-8040, U+8043-8044, U+8046, U+804a, U+8052, U+8058, U+805a, U+805f-8060, U+8062, U+8064, U+8066, U+8068, U+806d, U+806f-8073, U+8075-8076, U+8079, U+807b, U+807d-8081, U+8084-8088, U+808b, U+808e, U+8093, U+8099-809a, U+809c, U+809e, U+80a4, U+80a6-80a7, U+80ab-80ad, U+80b1, U+80b8-80b9, U+80c4-80c5, U+80c8, U+80ca, U+80cd, U+80cf, U+80d2, U+80d4-80db, U+80dd, U+80e0, U+80e4-80e6, U+80ed-80f3, U+80f5-80f7, U+80f9-80fc, U+80fe, U+8101, U+8103, U+8109, U+810b, U+810d, U+8116-8118, U+811b-811c, U+811e, U+8120, U+8123-8124, U+8127, U+8129, U+812b-812c, U+812f-8130, U+8135, U+8139-813a, U+813c-813e, U+8141, U+8145-8147; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.23.woff2) format('woff2'); - unicode-range: U+7d57, U+7d59-7d5d, U+7d63, U+7d65, U+7d67, U+7d6a, U+7d6e, U+7d70, U+7d72-7d73, U+7d78, U+7d7a-7d7b, U+7d7d, U+7d7f, U+7d81-7d83, U+7d85-7d86, U+7d88-7d89, U+7d8b-7d8d, U+7d8f, U+7d91, U+7d93, U+7d96-7d97, U+7d9b-7da0, U+7da2-7da3, U+7da6-7da7, U+7daa-7dac, U+7dae-7db0, U+7db3, U+7db5-7db9, U+7dbd, U+7dc0, U+7dc2-7dc7, U+7dcc-7dce, U+7dd0, U+7dd5-7dd9, U+7ddc-7dde, U+7de1-7de6, U+7dea-7ded, U+7df1-7df2, U+7df5-7df6, U+7df9-7dfa, U+7e00, U+7e05, U+7e08-7e0b, U+7e10-7e12, U+7e15, U+7e17, U+7e1c-7e1d, U+7e1f-7e23, U+7e27-7e28, U+7e2c-7e2d, U+7e2f, U+7e31-7e33, U+7e35-7e37, U+7e39-7e3b, U+7e3d, U+7e3f, U+7e43-7e48, U+7e4e, U+7e50, U+7e52, U+7e56, U+7e58-7e5a, U+7e5d-7e5f, U+7e61-7e62, U+7e65-7e67, U+7e69-7e6b, U+7e6d-7e6f, U+7e73, U+7e75, U+7e78-7e79, U+7e7b-7e7f, U+7e81-7e83, U+7e86-7e8a, U+7e8c-7e8e, U+7e90-7e96, U+7e98, U+7e9a-7e9f, U+7f38, U+7f3a-7f3f, U+7f43-7f45, U+7f47, U+7f4c-7f50, U+7f52-7f55, U+7f58, U+7f5b-7f5d, U+7f5f, U+7f61, U+7f63-7f69, U+7f6b, U+7f6d, U+7f71; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.24.woff2) format('woff2'); - unicode-range: U+7bc8, U+7bca-7bcc, U+7bcf, U+7bd4, U+7bd6-7bd7, U+7bd9-7bdb, U+7bdd, U+7be5-7be6, U+7be8-7bea, U+7bf0, U+7bf2-7bfa, U+7bfc, U+7bfe, U+7c00-7c04, U+7c06-7c07, U+7c09, U+7c0b-7c0f, U+7c11-7c14, U+7c17, U+7c19, U+7c1b, U+7c1e-7c20, U+7c23, U+7c25-7c28, U+7c2a-7c2c, U+7c2f, U+7c31, U+7c33-7c34, U+7c36-7c3a, U+7c3d-7c3e, U+7c40, U+7c42-7c43, U+7c45-7c46, U+7c4a, U+7c4c, U+7c4f-7c5f, U+7c61, U+7c63-7c65, U+7c67, U+7c69, U+7c6c-7c70, U+7c72, U+7c75, U+7c79, U+7c7b-7c7e, U+7c81-7c83, U+7c86-7c87, U+7c8d, U+7c8f-7c90, U+7c94, U+7c9e, U+7ca0-7ca2, U+7ca4-7ca6, U+7ca8, U+7cab, U+7cad-7cae, U+7cb0-7cb3, U+7cb6-7cb7, U+7cb9-7cbd, U+7cbf-7cc0, U+7cc2, U+7cc4-7cc5, U+7cc7-7cca, U+7ccd-7ccf, U+7cd2-7cd5, U+7cd7-7cda, U+7cdc-7cdd, U+7cdf-7ce0, U+7ce2, U+7ce6, U+7ce9, U+7ceb, U+7cef, U+7cf2, U+7cf4-7cf6, U+7cf9-7cfa, U+7cfe, U+7d02-7d03, U+7d06-7d0a, U+7d0f, U+7d11-7d13, U+7d15-7d16, U+7d1c-7d1e, U+7d23, U+7d26, U+7d2a, U+7d2c-7d2e, U+7d31-7d32, U+7d35, U+7d3c-7d41, U+7d43, U+7d45, U+7d47-7d48, U+7d4b, U+7d4d-7d4f, U+7d51, U+7d53, U+7d55-7d56; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.25.woff2) format('woff2'); - unicode-range: U+7a17-7a19, U+7a1b, U+7a1e-7a21, U+7a27, U+7a2b, U+7a2d, U+7a2f-7a31, U+7a34-7a35, U+7a37-7a3b, U+7a3e, U+7a43-7a49, U+7a4c, U+7a4e, U+7a50, U+7a55-7a57, U+7a59, U+7a5c-7a5d, U+7a5f-7a63, U+7a65, U+7a67, U+7a69-7a6a, U+7a6d, U+7a70, U+7a75, U+7a78-7a79, U+7a7d-7a7e, U+7a80, U+7a82, U+7a84-7a86, U+7a88, U+7a8a-7a8b, U+7a90-7a91, U+7a94-7a98, U+7a9e, U+7aa0, U+7aa3, U+7aa9, U+7aac, U+7ab0, U+7ab3, U+7ab5-7ab6, U+7ab9-7abf, U+7ac3, U+7ac5-7aca, U+7acc-7acf, U+7ad1-7ad3, U+7ad5, U+7ada-7adb, U+7add, U+7adf, U+7ae1-7ae2, U+7ae6-7aed, U+7af0-7af1, U+7af4, U+7af8, U+7afa-7afb, U+7afd-7afe, U+7b02, U+7b04, U+7b06-7b08, U+7b0a-7b0b, U+7b0f, U+7b12, U+7b14, U+7b18-7b19, U+7b1e-7b1f, U+7b23, U+7b25, U+7b27-7b2b, U+7b2d-7b31, U+7b33-7b36, U+7b3b, U+7b3d, U+7b3f-7b41, U+7b45, U+7b47, U+7b4c-7b50, U+7b53, U+7b55, U+7b5d, U+7b60, U+7b64-7b66, U+7b69-7b6a, U+7b6c-7b75, U+7b77, U+7b79-7b7a, U+7b7f, U+7b84, U+7b86, U+7b89, U+7b8d-7b92, U+7b96, U+7b98-7ba0, U+7ba5, U+7bac-7bad, U+7baf-7bb0, U+7bb2, U+7bb4-7bb6, U+7bba-7bbd, U+7bc1-7bc2, U+7bc5-7bc6; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.26.woff2) format('woff2'); - unicode-range: U+7851-7852, U+785c, U+785e, U+7860-7861, U+7863-7864, U+7868, U+786a, U+786e-786f, U+7872, U+7874, U+787a, U+787c, U+787e, U+7886-7887, U+788a, U+788c-788f, U+7893-7895, U+7898, U+789a, U+789d-789f, U+78a1, U+78a3-78a4, U+78a8-78aa, U+78ac-78ad, U+78af-78b3, U+78b5, U+78bb-78bf, U+78c5-78cc, U+78ce, U+78d1-78d6, U+78da-78db, U+78df-78e1, U+78e4, U+78e6-78e7, U+78ea, U+78ec, U+78f2-78f4, U+78f6-78f7, U+78f9-78fb, U+78fd-7901, U+7906-7907, U+790c, U+7910-7912, U+7919-791c, U+791e-7920, U+7925-792e, U+7930-7931, U+7934-7935, U+793b, U+793d, U+793f, U+7941-7942, U+7944-7946, U+794a-794b, U+794f, U+7951, U+7954-7955, U+7957-7958, U+795a-795c, U+795f-7960, U+7962, U+7967, U+7969, U+796b, U+7972, U+7977, U+7979-797c, U+797e-7980, U+798a-798e, U+7991, U+7993-7996, U+7998, U+799b-799d, U+79a1, U+79a6-79ab, U+79ae-79b1, U+79b3-79b4, U+79b8-79bb, U+79bd-79be, U+79c2, U+79c4, U+79c7-79ca, U+79cc-79cd, U+79cf, U+79d4-79d6, U+79da, U+79dd-79e3, U+79e5, U+79e7, U+79ea-79ed, U+79f1, U+79f8, U+79fc, U+7a02-7a03, U+7a05, U+7a07-7a0a, U+7a0c-7a0d, U+7a11, U+7a15; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.27.woff2) format('woff2'); - unicode-range: U+768c-768e, U+7690, U+7693, U+7695-7696, U+7699-76a8, U+76aa, U+76ad, U+76af-76b0, U+76b4, U+76b6-76ba, U+76bd, U+76c1-76c3, U+76c5, U+76c8-76c9, U+76cb-76ce, U+76d2, U+76d4, U+76d6, U+76d9, U+76dc, U+76de, U+76e0-76e1, U+76e5-76e8, U+76ea-76ec, U+76f0-76f1, U+76f6, U+76f9, U+76fb-76fc, U+7700, U+7704, U+7706-7708, U+770a, U+770e, U+7712, U+7714-7715, U+7717, U+7719-771c, U+7722, U+7724-7726, U+7728, U+772d-772f, U+7734-7739, U+773d-773e, U+7742, U+7745-7747, U+774a, U+774d-774f, U+7752, U+7756-7758, U+775a-775c, U+775e-7760, U+7762, U+7764-7765, U+7767, U+776a-776c, U+7770, U+7772-7774, U+7779-777a, U+777c-7780, U+7784, U+778b-778e, U+7794-7796, U+779a, U+779e-77a0, U+77a2, U+77a4-77a5, U+77a7, U+77a9-77aa, U+77ae-77b1, U+77b5-77b7, U+77b9, U+77bb-77bf, U+77c3, U+77c7, U+77c9, U+77cd, U+77d1-77d2, U+77d5, U+77d7, U+77d9-77da, U+77dc, U+77de-77e0, U+77e3-77e4, U+77e6-77e7, U+77e9-77ea, U+77ec, U+77ee, U+77f0-77f1, U+77f4, U+77f8, U+77fb-77fc, U+7805-7806, U+7809, U+780c-780e, U+7811-7812, U+7819, U+781d, U+7820-7823, U+7826-7827, U+782c-782e, U+7830, U+7835, U+7837, U+783a, U+783f, U+7843-7845, U+7847-7848, U+784c, U+784e-784f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.28.woff2) format('woff2'); - unicode-range: U+7511-7513, U+7515-7517, U+751c, U+751e, U+7520-7522, U+7524, U+7526-7527, U+7529-752c, U+752f, U+7536, U+7538-7539, U+753c-7540, U+7543-7544, U+7546-754b, U+754d-7550, U+7552, U+7557, U+755a-755b, U+755d-755f, U+7561-7562, U+7564, U+7566-7567, U+7569, U+756b-756d, U+756f, U+7571-7572, U+7574-757e, U+7581-7582, U+7585-7587, U+7589-758c, U+758f-7590, U+7592-7595, U+7599-759a, U+759c-759d, U+75a2-75a5, U+75b0-75b1, U+75b3-75b5, U+75b7-75b8, U+75ba, U+75bd, U+75bf-75c4, U+75c6, U+75ca, U+75cc-75cf, U+75d3-75d4, U+75d7-75d8, U+75dc-75e1, U+75e3-75e4, U+75e7, U+75ec, U+75ee-75f3, U+75f9, U+75fc, U+75fe-7604, U+7607-760c, U+760f, U+7612-7613, U+7615-7616, U+7618-7619, U+761b-7629, U+762d, U+7630, U+7632-7635, U+7638-763c, U+7640-7641, U+7643-764b, U+764e, U+7655, U+7658-7659, U+765c, U+765f, U+7661-7662, U+7664-7665, U+7667-766a, U+766c-7672, U+7674, U+7676, U+7678, U+7680-7683, U+7685, U+7688, U+768b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.29.woff2) format('woff2'); - unicode-range: U+736c, U+736e-7371, U+7375, U+7377-737c, U+7380-7381, U+7383, U+7385-7386, U+738a, U+738e, U+7390, U+7393-7398, U+739c, U+739e-73a0, U+73a2, U+73a5-73a6, U+73a8, U+73aa-73ab, U+73ad, U+73b3, U+73b5, U+73b7, U+73b9-73bd, U+73bf, U+73c5-73c6, U+73c9-73cc, U+73ce-73cf, U+73d2-73d3, U+73d6, U+73d9, U+73dd-73de, U+73e1, U+73e3-73e7, U+73e9-73ea, U+73ee, U+73f1, U+73f4-73f5, U+73f7-73fb, U+73fd, U+73ff-7401, U+7404-7405, U+7407, U+740a, U+7411, U+7413, U+741a-741b, U+7421, U+7424, U+7426, U+7428-7431, U+7433, U+7439-743a, U+743f-7441, U+7443-7444, U+7446-7447, U+744b, U+744d, U+7451-7453, U+7455, U+7457, U+7459-745a, U+745c-745d, U+745f, U+7462-7464, U+7466-746b, U+746d-7473, U+7476, U+747e, U+7480-7481, U+7485-7489, U+748b, U+748f-7492, U+7497-749a, U+749c, U+749e-74a3, U+74a5-74a6, U+74a8-74ab, U+74ae-74af, U+74b1-74b2, U+74b5, U+74b9-74bb, U+74bd, U+74bf, U+74c8-74ca, U+74cc, U+74cf-74d0, U+74d3-74d4, U+74d6, U+74d8, U+74da-74db, U+74de-74e0, U+74e3-74e4, U+74e7-74eb, U+74ee-74f2, U+74f4, U+74f7-74f8, U+74fa-74fc, U+74ff, U+7501, U+7503-7506, U+750c-750e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.30.woff2) format('woff2'); - unicode-range: U+7166, U+7168, U+716c, U+7179, U+7180, U+7184-7185, U+7187-7188, U+718c, U+718f, U+7192, U+7194-7196, U+7199-719b, U+71a0, U+71a2, U+71a8, U+71ac, U+71ae-71b0, U+71b2-71b3, U+71b9-71ba, U+71be-71c1, U+71c4, U+71c9, U+71cb-71cc, U+71ce, U+71d0, U+71d2-71d4, U+71d6-71d7, U+71d9-71da, U+71dc, U+71df-71e0, U+71e6-71e7, U+71ec-71ee, U+71f4-71f5, U+71f8-71f9, U+71fc, U+71fe-7200, U+7207-7209, U+720d, U+7210, U+7213, U+7215, U+7217, U+721a, U+721d, U+721f, U+7224, U+7228, U+722b, U+722d, U+722f-7230, U+7232, U+7234, U+7238-7239, U+723b-723c, U+723e-7243, U+7245-7246, U+724b, U+724e-7250, U+7252-7253, U+7255-7258, U+725a, U+725c, U+725e, U+7260, U+7263, U+7268, U+726b, U+726e-726f, U+7271, U+7274, U+7277-7278, U+727b-727c, U+727e-7282, U+7284, U+7287, U+7289, U+728d-728e, U+7292-7293, U+7296, U+729b, U+72a2, U+72a7-72a8, U+72ad-72ae, U+72b0-72b2, U+72b4, U+72b9, U+72be, U+72c0-72c1, U+72c3-72c4, U+72c6-72c7, U+72c9, U+72cc, U+72ce, U+72d2, U+72d5-72d6, U+72d8, U+72df-72e2, U+72e5, U+72f3-72f4, U+72f7, U+72f9-72fb, U+72fd-72fe, U+7302, U+7304-7305, U+7307, U+730a-730b, U+730d, U+7312-7313, U+7316-7319, U+731c-731e, U+7322, U+7324, U+7327-7329, U+732c, U+732f, U+7331-7337, U+7339-733b, U+733d-733e, U+7343, U+734d-7350, U+7352, U+7356-7358, U+735d-7360, U+7366-736b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.31.woff2) format('woff2'); - unicode-range: U+6f58-6f5b, U+6f5d-6f5e, U+6f60-6f62, U+6f66, U+6f68, U+6f6c-6f6d, U+6f6f, U+6f74, U+6f78, U+6f7a, U+6f7c-6f7e, U+6f80, U+6f82-6f83, U+6f86-6f88, U+6f8b-6f8e, U+6f90-6f94, U+6f96-6f98, U+6f9a, U+6f9d, U+6f9f-6fa1, U+6fa3, U+6fa5-6fa8, U+6fae-6fb1, U+6fb3, U+6fb5-6fb7, U+6fb9, U+6fbc, U+6fbe, U+6fc2, U+6fc5-6fca, U+6fd4-6fd5, U+6fd8, U+6fda-6fdb, U+6fde-6fe0, U+6fe4, U+6fe8-6fe9, U+6feb-6fec, U+6fee, U+6ff0, U+6ff3, U+6ff5-6ff6, U+6ff9-6ffa, U+6ffc-6ffe, U+7000-7001, U+7005-7007, U+7009-700b, U+700d, U+700f, U+7011, U+7015, U+7017-7018, U+701a-701b, U+701d-7020, U+7023, U+7026, U+7028, U+702f-7030, U+7032, U+7034, U+7037, U+7039-703a, U+703c, U+703e, U+7043-7044, U+7047-704c, U+704e, U+7051, U+7054-7055, U+705d-705e, U+7064-7065, U+7069, U+706c, U+706e, U+7075-7076, U+707e, U+7081, U+7085-7086, U+7094-7098, U+709b, U+709f, U+70a4, U+70ab-70ac, U+70ae-70b1, U+70b3-70b4, U+70b7, U+70bb, U+70ca-70cb, U+70d1, U+70d3-70d6, U+70d8-70d9, U+70dc-70dd, U+70df, U+70e4, U+70ec, U+70f1, U+70fa, U+70fd, U+7103-7108, U+710b-710c, U+710f, U+7114, U+7119, U+711c, U+711e, U+7120, U+712b, U+712d-7131, U+7138, U+7141, U+7145-7147, U+7149-714b, U+7150-7153, U+7155-7157, U+715a, U+715c, U+715e, U+7160, U+7162, U+7164-7165; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.32.woff2) format('woff2'); - unicode-range: U+6d7c, U+6d80-6d82, U+6d85, U+6d87, U+6d89-6d8a, U+6d8c-6d8e, U+6d91-6d98, U+6d9c, U+6daa-6dac, U+6dae, U+6db4-6db5, U+6db7-6db9, U+6dbd, U+6dbf, U+6dc2, U+6dc4-6dc8, U+6dca, U+6dcc, U+6dce-6dd0, U+6dd2, U+6dd5-6dd6, U+6dd8-6ddb, U+6ddd-6de0, U+6de2, U+6de4-6de6, U+6de8-6dea, U+6dec, U+6dee-6df0, U+6df2, U+6df4, U+6df6, U+6df8-6dfa, U+6dfc, U+6e00, U+6e04, U+6e0a, U+6e17, U+6e19, U+6e1d-6e20, U+6e22-6e25, U+6e27, U+6e2b, U+6e2d-6e2e, U+6e32, U+6e34, U+6e36, U+6e38-6e3c, U+6e42-6e45, U+6e48-6e49, U+6e4b-6e4f, U+6e51-6e54, U+6e57, U+6e5b-6e5f, U+6e62-6e63, U+6e68, U+6e6b, U+6e6e, U+6e72-6e73, U+6e76, U+6e7b, U+6e7d, U+6e82, U+6e89, U+6e8c-6e8d, U+6e8f, U+6e93, U+6e98-6e99, U+6e9f-6ea0, U+6ea5, U+6ea7, U+6eaa-6eab, U+6ead-6eaf, U+6eb1-6eb4, U+6eb7, U+6ebb-6ebd, U+6ebf-6ec4, U+6ec7-6eca, U+6ecc-6ecf, U+6ed3-6ed5, U+6ed9-6edb, U+6ee6, U+6eeb-6eef, U+6ef7-6ef9, U+6efb, U+6efd-6eff, U+6f04, U+6f08-6f0a, U+6f0c-6f0d, U+6f10-6f11, U+6f13, U+6f15-6f16, U+6f18, U+6f1a-6f1b, U+6f25-6f26, U+6f29-6f2a, U+6f2d, U+6f2f-6f33, U+6f35-6f36, U+6f38, U+6f3b-6f3c, U+6f3e-6f3f, U+6f41, U+6f45, U+6f4f, U+6f51-6f53, U+6f57; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.33.woff2) format('woff2'); - unicode-range: U+6b85, U+6b89, U+6b8d, U+6b95, U+6b97-6b98, U+6b9b, U+6b9e-6ba0, U+6ba2-6ba4, U+6ba8-6bb3, U+6bb7-6bb9, U+6bbc-6bbe, U+6bc0, U+6bc3-6bc4, U+6bc6-6bc9, U+6bcb-6bcc, U+6bcf, U+6bd3, U+6bd6-6bd8, U+6bda, U+6bdf, U+6be1, U+6be3, U+6be6-6be7, U+6beb-6bec, U+6bee, U+6bf1, U+6bf3, U+6bf7, U+6bf9, U+6bff, U+6c02, U+6c04-6c05, U+6c08-6c0a, U+6c0d-6c0e, U+6c10, U+6c12-6c14, U+6c19, U+6c1b, U+6c1f, U+6c24, U+6c26-6c28, U+6c2c, U+6c2e, U+6c33, U+6c35-6c36, U+6c3a-6c3b, U+6c3e-6c40, U+6c4a-6c4b, U+6c4d, U+6c4f, U+6c52, U+6c54-6c55, U+6c59, U+6c5b-6c5e, U+6c62, U+6c67-6c68, U+6c6a-6c6b, U+6c6d, U+6c6f, U+6c73-6c74, U+6c76, U+6c78-6c79, U+6c7b, U+6c7e, U+6c81-6c87, U+6c89, U+6c8c-6c8d, U+6c90, U+6c92-6c95, U+6c97-6c98, U+6c9a-6c9c, U+6c9f, U+6caa-6cae, U+6cb0-6cb2, U+6cb4, U+6cba, U+6cbd-6cbe, U+6cc2, U+6cc5-6cc6, U+6ccd, U+6ccf-6cd4, U+6cd6-6cd7, U+6cd9-6cdd, U+6ce0, U+6ce7, U+6ce9-6cef, U+6cf1-6cf2, U+6cf4, U+6cfb, U+6d00-6d01, U+6d04, U+6d07, U+6d0a, U+6d0c, U+6d0e-6d0f, U+6d11, U+6d13, U+6d19-6d1a, U+6d1f, U+6d24, U+6d26-6d28, U+6d2b, U+6d2e-6d2f, U+6d31, U+6d33-6d36, U+6d38-6d39, U+6d3c-6d3d, U+6d3f, U+6d57-6d5b, U+6d5e-6d61, U+6d64-6d65, U+6d67, U+6d6c, U+6d6f-6d70, U+6d79; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.34.woff2) format('woff2'); - unicode-range: U+69dd-69de, U+69e2-69e3, U+69e5, U+69e7-69eb, U+69ed-69ef, U+69f1-69f6, U+69f9, U+69fe-6a01, U+6a03, U+6a05, U+6a0a, U+6a0c, U+6a0f, U+6a11-6a15, U+6a17, U+6a1a-6a1b, U+6a1d-6a20, U+6a22-6a24, U+6a28, U+6a2e, U+6a30, U+6a32-6a38, U+6a3b, U+6a3e-6a3f, U+6a44-6a4a, U+6a4e, U+6a50-6a52, U+6a54-6a56, U+6a5b, U+6a61-6a62, U+6a64, U+6a66-6a67, U+6a6a-6a6b, U+6a71-6a73, U+6a78, U+6a7a, U+6a7e-6a7f, U+6a81, U+6a83-6a84, U+6a86-6a87, U+6a89, U+6a8b, U+6a8d, U+6a90-6a91, U+6a94, U+6a97, U+6a9b, U+6a9d-6aa3, U+6aa5, U+6aaa-6aac, U+6aae-6ab1, U+6ab3-6ab4, U+6ab8, U+6abb, U+6abd-6abf, U+6ac1-6ac3, U+6ac6, U+6ac8-6ac9, U+6acc, U+6ad0-6ad1, U+6ad3-6ad6, U+6ada-6adf, U+6ae2, U+6ae4, U+6ae7-6ae8, U+6aea, U+6aec, U+6af0-6af3, U+6af8, U+6afa, U+6afc-6afd, U+6b02-6b03, U+6b06-6b07, U+6b09-6b0b, U+6b0f-6b12, U+6b16-6b17, U+6b1b, U+6b1d-6b1f, U+6b23-6b24, U+6b28, U+6b2b-6b2c, U+6b2f, U+6b35-6b39, U+6b3b, U+6b3d, U+6b3f, U+6b43, U+6b46-6b47, U+6b49-6b4a, U+6b4d-6b4e, U+6b50, U+6b52, U+6b54, U+6b56, U+6b58-6b59, U+6b5b, U+6b5d, U+6b5f-6b61, U+6b65, U+6b67, U+6b6b-6b6c, U+6b6e, U+6b70, U+6b72, U+6b75, U+6b77-6b7a, U+6b7d-6b84; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.35.woff2) format('woff2'); - unicode-range: U+6855, U+6857-6859, U+685b, U+685d, U+685f, U+6863, U+6867, U+686b, U+686e-6872, U+6874-6875, U+6877, U+6879-687c, U+687e-687f, U+6882-6884, U+6886, U+6888, U+688d-6890, U+6894, U+6896, U+6898-689c, U+689f-68a3, U+68a5-68a7, U+68a9-68ab, U+68ad-68af, U+68b2-68b5, U+68b9-68bc, U+68c3, U+68c5-68c6, U+68c8-68ca, U+68cc-68cd, U+68cf-68d1, U+68d3-68d9, U+68dc-68dd, U+68e0-68e1, U+68e3-68e5, U+68e7-68e8, U+68ea-68ed, U+68ef-68f1, U+68f5-68f7, U+68f9, U+68fb-68fd, U+6900-6901, U+6903-6904, U+6906-690c, U+690f-6911, U+6913, U+6916-6917, U+6919-691b, U+6921-6923, U+6925-6926, U+6928, U+692a, U+6930-6931, U+6933-6936, U+6938-6939, U+693b, U+693d, U+6942, U+6945-6946, U+6949, U+694e, U+6954, U+6957, U+6959, U+695b-695e, U+6961-6966, U+6968-696c, U+696e-6974, U+6977-697b, U+697e-6981, U+6986, U+698d, U+6991-6992, U+6994-6996, U+6998, U+699c, U+69a0-69a1, U+69a5-69a8, U+69ab, U+69ad, U+69af-69b2, U+69b4, U+69b7-69b8, U+69ba-69bc, U+69be-69c1, U+69c3, U+69c5, U+69c7-69c8, U+69ca, U+69ce-69d1, U+69d3, U+69d6-69d7, U+69d9; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.36.woff2) format('woff2'); - unicode-range: U+667e-6680, U+6683-6684, U+6688, U+668b-668e, U+6690, U+6692, U+6698-669d, U+669f-66a0, U+66a2, U+66a4, U+66ad, U+66b1-66b3, U+66b5, U+66b8-66b9, U+66bb-66bc, U+66be-66c4, U+66c6, U+66c8-66c9, U+66cc, U+66ce-66cf, U+66d4, U+66da-66db, U+66dd, U+66df-66e0, U+66e6, U+66e8-66e9, U+66eb-66ec, U+66ee, U+66f5, U+66f7, U+66fa-66fc, U+6701, U+6705, U+6707, U+670c, U+670e-6710, U+6712-6716, U+6719, U+671c, U+671e, U+6720, U+6722, U+6725-6726, U+672e, U+6733, U+6735-6738, U+673e-673f, U+6741, U+6743, U+6745-6748, U+674c-674d, U+6753-6755, U+6759, U+675d-675e, U+6760, U+6762-6764, U+6766, U+676a, U+676c, U+676e, U+6770, U+6772-6774, U+6776-6777, U+677b-677c, U+6780-6781, U+6784-6785, U+6787, U+6789, U+678b-678c, U+678e-678f, U+6791-6793, U+6796, U+6798-6799, U+679b, U+67a1, U+67a4, U+67a6, U+67a9, U+67b0-67b5, U+67b7-67b9, U+67bb-67be, U+67c0-67c3, U+67c5-67c6, U+67c8-67c9, U+67ce, U+67d2, U+67d7-67d9, U+67db-67de, U+67e1-67e2, U+67e4, U+67e6-67e7, U+67e9, U+67ec, U+67ee-67f0, U+67f2, U+67f6-67f7, U+67f9-67fa, U+67fc, U+67fe, U+6801-6802, U+6805, U+6810, U+6814, U+6818-6819, U+681d, U+681f, U+6822, U+6827-6829, U+682b-682d, U+682f-6834, U+683b, U+683e-6840, U+6844-6846, U+6849-684a, U+684c-684e, U+6852-6854; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.37.woff2) format('woff2'); - unicode-range: U+64d2, U+64d4-64d5, U+64d7-64d8, U+64da, U+64e0-64e1, U+64e3-64e5, U+64e7, U+64e9-64ea, U+64ed, U+64ef-64f2, U+64f4-64f7, U+64fa-64fb, U+64fd-6501, U+6504-6505, U+6508-650a, U+650f, U+6513-6514, U+6516, U+6518-6519, U+651b-651f, U+6522, U+6524, U+6526, U+6529-652c, U+652e, U+6531-6532, U+6534-6538, U+653a, U+653c-653d, U+6543-6544, U+6547-6549, U+654d-654e, U+6550, U+6552, U+6554-6556, U+6558, U+655d-6560, U+6567, U+656b, U+6572, U+6578, U+657a, U+657d, U+6581-6585, U+6588, U+658a, U+658c, U+6592, U+6595, U+6598, U+659b, U+659d, U+659f-65a1, U+65a3-65a6, U+65ab, U+65ae, U+65b2-65b5, U+65b7-65b8, U+65be-65bf, U+65c1-65c4, U+65c6, U+65c8-65c9, U+65cc, U+65ce, U+65d0, U+65d2, U+65d4, U+65d6, U+65d8-65d9, U+65db, U+65df-65e1, U+65e3, U+65f0-65f2, U+65f4-65f5, U+65f9, U+65fb-65fc, U+65fe-6600, U+6603-6604, U+6608-660a, U+660d, U+6611-6612, U+6615-6616, U+661c-661e, U+6621-6624, U+6626, U+6629-662c, U+662e, U+6630-6631, U+6633-6637, U+6639-663b, U+663f-6641, U+6644-6646, U+6648-664a, U+664c, U+664e-664f, U+6651, U+6657-6665, U+6667-6668, U+666a-666d, U+6670, U+6673, U+6675, U+6677-6679, U+667b-667c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.38.woff2) format('woff2'); - unicode-range: U+62cf, U+62d1, U+62d4-62d6, U+62da, U+62dc, U+62ea, U+62ee-62ef, U+62f1-62f2, U+62f4-62f5, U+62fc-62fd, U+62ff, U+6302-6304, U+6308-630d, U+6310, U+6313, U+6316, U+6318, U+631b, U+6327, U+6329-632a, U+632d, U+6332, U+6335-6336, U+6339-633c, U+633e, U+6341-6344, U+6346, U+634a-634e, U+6350, U+6352-6354, U+6358-6359, U+635b, U+6365-6366, U+6369, U+636b-636d, U+6371-6372, U+6374-6378, U+637a, U+637c-637d, U+637f-6380, U+6382, U+6384, U+6387, U+6389-638a, U+638e-6390, U+6394-6396, U+6399-639a, U+639e, U+63a0, U+63a3-63a4, U+63a6, U+63a9, U+63ab-63af, U+63b5, U+63bd-63be, U+63c0-63c1, U+63c4-63c6, U+63c8, U+63ce, U+63d1-63d6, U+63dc, U+63e0, U+63e3, U+63e5, U+63e9-63ed, U+63f2-63f3, U+63f5-63f9, U+6406, U+6409-640a, U+640f-6410, U+6412-6414, U+6416-6418, U+641e, U+6420, U+6422, U+6424-6426, U+6428-642a, U+642f-6430, U+6434-6436, U+643d, U+643f, U+644b, U+644e-644f, U+6451-6454, U+645a-645d, U+645f-6461, U+6463, U+6467, U+646d, U+6473-6474, U+6476, U+6478-6479, U+647b, U+647d, U+6485, U+6487-6488, U+648f-6491, U+6493, U+6495, U+6498-649b, U+649d-649f, U+64a1, U+64a3, U+64a6, U+64a8-64a9, U+64ac, U+64b3, U+64bb-64bf, U+64c2, U+64c4-64c5, U+64c7, U+64c9-64cc, U+64ce, U+64d0-64d1; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.39.woff2) format('woff2'); - unicode-range: U+6117, U+6119, U+611c, U+611e, U+6120-6122, U+6127-6128, U+612a-612c, U+6130-6131, U+6134-6137, U+6139-613a, U+613c-613f, U+6141-6142, U+6144-6147, U+6149-614a, U+614d, U+6153, U+6158-615a, U+615d-6160, U+6164-6165, U+616b-616c, U+616f, U+6171-6175, U+6177-6178, U+617b-6181, U+6183-6184, U+6187, U+618a-618b, U+618d, U+6192-6194, U+6196-619a, U+619c-619d, U+619f-61a0, U+61a5, U+61a8, U+61aa-61ae, U+61b8-61ba, U+61bc, U+61be, U+61c0-61c3, U+61c6, U+61c8, U+61ca-61cf, U+61d5, U+61dc-61df, U+61e1-61e3, U+61e5-61e9, U+61ec-61ed, U+61ef, U+61f4-61f7, U+61fa, U+61fc-6201, U+6203-6204, U+6207-620a, U+620d-620e, U+6213-6215, U+621b-621e, U+6220-6223, U+6227, U+6229-622b, U+622e, U+6230-6233, U+6236, U+6239, U+623d-623e, U+6241-6244, U+6246, U+6248, U+624c, U+624e, U+6250-6252, U+6254, U+6256, U+6258, U+625a-625c, U+625e, U+6260-6261, U+6263-6264, U+6268, U+626d, U+626f, U+6273, U+627a-627e, U+6282-6283, U+6285, U+6289, U+628d-6290, U+6292-6294, U+6296, U+6299, U+629b, U+62a6, U+62a8, U+62ac, U+62b3, U+62b6-62b7, U+62ba-62bb, U+62be-62bf, U+62c2, U+62c4, U+62c6-62c8, U+62ca, U+62ce; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.40.woff2) format('woff2'); - unicode-range: U+5f6c-5f6d, U+5f6f, U+5f72-5f75, U+5f78, U+5f7a, U+5f7d-5f7f, U+5f82-5f83, U+5f87-5f89, U+5f8d, U+5f8f, U+5f91, U+5f96, U+5f99, U+5f9c-5f9d, U+5fa0, U+5fa2, U+5fa4, U+5fa7-5fa8, U+5fab-5fad, U+5faf-5fb1, U+5fb5, U+5fb7-5fb8, U+5fbc-5fbd, U+5fc4, U+5fc7-5fc9, U+5fcb, U+5fd0-5fd4, U+5fdd-5fde, U+5fe1-5fe2, U+5fe4, U+5fe8-5fea, U+5fec-5ff3, U+5ff6, U+5ff8, U+5ffa-5ffd, U+5fff, U+6007, U+600a, U+600d-6010, U+6013-6015, U+6017-601b, U+601f, U+6021-6022, U+6024, U+6026, U+6029, U+602b, U+602d, U+6031, U+6033, U+6035, U+603a, U+6040-6043, U+6046-604a, U+604c-604d, U+6051, U+6054-6057, U+6059-605a, U+605d, U+605f-6064, U+6067, U+606a-606c, U+6070-6071, U+6077, U+607e-607f, U+6081-6086, U+6088-608e, U+6091-6093, U+6095-6098, U+609a-609b, U+609d-609e, U+60a2, U+60a4-60a5, U+60a7-60a8, U+60b0-60b1, U+60b3-60b5, U+60b7-60b8, U+60bb, U+60bd-60be, U+60c2, U+60c4, U+60c6-60cb, U+60ce-60cf, U+60d3-60d5, U+60d8-60d9, U+60db, U+60dd-60df, U+60e1-60e2, U+60e5, U+60ee, U+60f0-60f2, U+60f4-60f8, U+60fa-60fd, U+6100, U+6102-6103, U+6106-6108, U+610a, U+610c-610e, U+6110-6114, U+6116; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.41.woff2) format('woff2'); - unicode-range: U+5d9b, U+5d9d, U+5d9f-5da0, U+5da2, U+5da4, U+5da7, U+5dab-5dac, U+5dae, U+5db0, U+5db2, U+5db4, U+5db7-5db9, U+5dbc-5dbd, U+5dc3, U+5dc7, U+5dc9, U+5dcb-5dce, U+5dd0-5dd3, U+5dd6-5dd9, U+5ddb, U+5de0, U+5de2, U+5de4, U+5de9, U+5df2, U+5df5, U+5df8-5df9, U+5dfd, U+5dff-5e00, U+5e07, U+5e0b, U+5e0d, U+5e11-5e12, U+5e14-5e15, U+5e18-5e1b, U+5e1f-5e20, U+5e25, U+5e28, U+5e2e, U+5e32, U+5e35-5e37, U+5e3e, U+5e40, U+5e43-5e44, U+5e47, U+5e49, U+5e4b, U+5e4e, U+5e50-5e51, U+5e54, U+5e56-5e58, U+5e5b-5e5c, U+5e5e-5e5f, U+5e62, U+5e64, U+5e68, U+5e6a-5e6e, U+5e70, U+5e75-5e77, U+5e7a, U+5e7f-5e80, U+5e87, U+5e8b, U+5e8e, U+5e96, U+5e99-5e9a, U+5ea0, U+5ea2, U+5ea4-5ea5, U+5ea8, U+5eaa, U+5eac, U+5eb1, U+5eb3, U+5eb8-5eb9, U+5ebd-5ebf, U+5ec1-5ec2, U+5ec6, U+5ec8, U+5ecb-5ecc, U+5ece-5ed6, U+5ed9-5ee2, U+5ee5, U+5ee8-5ee9, U+5eeb-5eec, U+5ef0-5ef1, U+5ef3-5ef4, U+5ef8-5ef9, U+5efc-5f00, U+5f02-5f03, U+5f06-5f09, U+5f0b-5f0e, U+5f11, U+5f16-5f17, U+5f19, U+5f1b-5f1e, U+5f21-5f24, U+5f27-5f29, U+5f2b-5f30, U+5f34, U+5f36, U+5f38, U+5f3a-5f3d, U+5f3f-5f41, U+5f44-5f45, U+5f47-5f48, U+5f4a, U+5f4c-5f4e, U+5f50-5f51, U+5f54, U+5f56-5f58, U+5f5b-5f5d, U+5f60, U+5f63-5f65, U+5f67, U+5f6a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.42.woff2) format('woff2'); - unicode-range: U+5bbc, U+5bc0-5bc1, U+5bc3, U+5bc7, U+5bc9, U+5bcd-5bd0, U+5bd3-5bd4, U+5bd6-5bda, U+5bde, U+5be0-5be2, U+5be4-5be6, U+5be8, U+5beb-5bec, U+5bef-5bf1, U+5bf3-5bf6, U+5bfd, U+5c03, U+5c05, U+5c07-5c09, U+5c0c-5c0d, U+5c12-5c14, U+5c17, U+5c19, U+5c1e-5c20, U+5c22-5c24, U+5c26, U+5c28-5c2e, U+5c30, U+5c32, U+5c35-5c36, U+5c38-5c39, U+5c46, U+5c4d-5c50, U+5c53, U+5c59-5c5c, U+5c5f-5c63, U+5c67-5c69, U+5c6c-5c70, U+5c74-5c76, U+5c79-5c7d, U+5c87-5c88, U+5c8a, U+5c8c, U+5c8f, U+5c91-5c92, U+5c94, U+5c9d, U+5c9f-5ca0, U+5ca2-5ca3, U+5ca6-5ca8, U+5caa-5cab, U+5cad, U+5cb1-5cb2, U+5cb4-5cb7, U+5cba-5cbc, U+5cbe, U+5cc5, U+5cc7, U+5cc9, U+5ccb, U+5cd0, U+5cd2, U+5cd7, U+5cd9, U+5cdd, U+5ce6, U+5ce8-5cea, U+5ced-5cee, U+5cf1-5cf2, U+5cf4-5cf5, U+5cfa-5cfb, U+5cfd, U+5d01, U+5d06, U+5d0b, U+5d0d, U+5d10-5d12, U+5d14-5d15, U+5d17-5d1b, U+5d1d, U+5d1f-5d20, U+5d22-5d24, U+5d26-5d27, U+5d2b, U+5d31, U+5d34, U+5d39, U+5d3d, U+5d3f, U+5d42-5d43, U+5d46-5d48, U+5d4a-5d4b, U+5d4e, U+5d51-5d53, U+5d55, U+5d59, U+5d5c, U+5d5f-5d62, U+5d64, U+5d69-5d6a, U+5d6c-5d6d, U+5d6f-5d70, U+5d73, U+5d76, U+5d79-5d7a, U+5d7e-5d7f, U+5d81-5d84, U+5d87-5d88, U+5d8a, U+5d8c, U+5d90, U+5d92-5d95, U+5d97, U+5d99; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.43.woff2) format('woff2'); - unicode-range: U+598b-598e, U+5992, U+5995, U+5997, U+599b, U+599d, U+599f, U+59a3-59a4, U+59a7, U+59ad-59b0, U+59b2-59b3, U+59b7, U+59ba, U+59bc, U+59be, U+59c1, U+59c3-59c4, U+59c6, U+59c8, U+59ca, U+59cd, U+59d2, U+59d9-59da, U+59dd-59df, U+59e3-59e5, U+59e7-59e8, U+59ec, U+59ee-59ef, U+59f1-59f2, U+59f4, U+59f6-59f8, U+5a00, U+5a03-5a04, U+5a09, U+5a0c-5a0e, U+5a11-5a13, U+5a17, U+5a1a-5a1c, U+5a1e-5a1f, U+5a23-5a25, U+5a27-5a28, U+5a2a, U+5a2d, U+5a30, U+5a35-5a36, U+5a40-5a41, U+5a44-5a45, U+5a47-5a49, U+5a4c, U+5a50, U+5a55, U+5a5e, U+5a62-5a63, U+5a65, U+5a67, U+5a6a, U+5a6c-5a6d, U+5a77, U+5a7a-5a7b, U+5a7e, U+5a84, U+5a8b, U+5a90, U+5a93, U+5a96, U+5a99, U+5a9c, U+5a9e-5aa0, U+5aa2, U+5aa7, U+5aac, U+5ab1-5ab3, U+5ab5, U+5ab8, U+5aba-5abf, U+5ac2, U+5ac4, U+5ac6, U+5ac8, U+5acb, U+5acf-5ad0, U+5ad6-5ad7, U+5ada, U+5adc, U+5ae0-5ae1, U+5ae3, U+5ae5-5ae6, U+5ae9-5aea, U+5aee, U+5af0, U+5af5-5af6, U+5afa-5afb, U+5afd, U+5b00-5b01, U+5b08, U+5b0b, U+5b16-5b17, U+5b19, U+5b1b, U+5b1d, U+5b21, U+5b25, U+5b2a, U+5b2c-5b2d, U+5b30, U+5b32, U+5b34, U+5b36, U+5b38, U+5b3e, U+5b40-5b41, U+5b43, U+5b45, U+5b4b-5b4c, U+5b51-5b52, U+5b56, U+5b5a-5b5c, U+5b5e-5b5f, U+5b65, U+5b68-5b69, U+5b6e-5b71, U+5b73, U+5b75-5b76, U+5b7a, U+5b7c-5b84, U+5b86, U+5b8a-5b8b, U+5b8d-5b8e, U+5b90-5b91, U+5b93-5b94, U+5b96, U+5ba5-5ba6, U+5ba8-5ba9, U+5bac-5bad, U+5baf, U+5bb1-5bb2, U+5bb7-5bb8, U+5bba; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.44.woff2) format('woff2'); - unicode-range: U+57b3, U+57b8, U+57bd, U+57c0, U+57c3, U+57c6-57c8, U+57cc, U+57cf, U+57d2-57d7, U+57dc-57de, U+57e0-57e1, U+57e3-57e4, U+57e6-57e7, U+57e9, U+57ed, U+57f0, U+57f4-57f6, U+57f8, U+57fb, U+57fd-57ff, U+5803-5804, U+5808-580d, U+5819, U+581b, U+581d-5821, U+5826-5827, U+582d, U+582f-5830, U+5832, U+5835, U+5839, U+583d, U+583f-5840, U+5849, U+584b-584d, U+584f-5852, U+5855, U+5858-5859, U+585f, U+5861-5862, U+5864, U+5867-5868, U+586d, U+5870, U+5872, U+5878-5879, U+587c, U+587f-5881, U+5885, U+5887-588d, U+588f-5890, U+5894, U+5896, U+5898, U+589d-589e, U+58a0-58a2, U+58a6, U+58a9-58ab, U+58ae, U+58b1-58b3, U+58b8-58bc, U+58be, U+58c2-58c5, U+58c8, U+58cd-58ce, U+58d0-58da, U+58dc-58e2, U+58e4-58e5, U+58e9, U+58ec, U+58ef, U+58f3-58f4, U+58f7, U+58f9, U+58fb-58fd, U+5902, U+5905-5906, U+590a-590d, U+5910, U+5912-5914, U+5918-5919, U+591b, U+591d, U+591f, U+5921, U+5923-5925, U+5928, U+592c-592d, U+592f-5930, U+5932-5933, U+5935-5936, U+5938-5939, U+593d-593f, U+5943, U+5946, U+594e, U+5950, U+5952-5953, U+5955, U+5957-595b, U+595d-5961, U+5963, U+5967, U+5969, U+596b-596d, U+596f, U+5972, U+5975-5976, U+5978-5979, U+597b-597c, U+5981; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.45.woff2) format('woff2'); - unicode-range: U+5616-5617, U+5619, U+561b, U+5620, U+5628, U+562c, U+562f-5639, U+563b-563d, U+563f-5641, U+5643-5644, U+5646-5647, U+5649, U+564b, U+564d-5650, U+5653-5654, U+565e, U+5660-5664, U+5666, U+5669-566d, U+566f, U+5671-5672, U+5675-5676, U+5678, U+567a, U+5680, U+5684-5688, U+568a-568c, U+568f, U+5694-5695, U+5699-569a, U+569d-56a0, U+56a5-56a9, U+56ab-56ae, U+56b1-56b4, U+56b6-56b7, U+56bc, U+56be, U+56c0, U+56c2-56c3, U+56c5, U+56c8-56d1, U+56d3, U+56d7-56d9, U+56dc-56dd, U+56df, U+56e1, U+56e4-56e8, U+56eb, U+56ed-56ee, U+56f1, U+56f6-56f7, U+56f9, U+56ff-5704, U+5707-570a, U+570c-570d, U+5711, U+5713, U+5715-5716, U+5718, U+571a-571d, U+5720-5726, U+5729-572a, U+572c, U+572e-572f, U+5733-5734, U+5737-5738, U+573b, U+573d-573f, U+5745-5746, U+574c-574f, U+5751-5752, U+5759, U+575f, U+5761-5762, U+5764-5765, U+5767-5769, U+576b, U+576d-5771, U+5773-5775, U+5777, U+5779-577c, U+577e-577f, U+5781, U+5783, U+5788-5789, U+578c, U+5793-5795, U+5797, U+5799-579a, U+579c-57a1, U+57a4, U+57a7-57aa, U+57ac, U+57ae, U+57b0; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.46.woff2) format('woff2'); - unicode-range: U+543f-5440, U+5443-5444, U+5447, U+544c-544f, U+5455, U+545e, U+5462, U+5464, U+5466-5467, U+5469, U+546b-546e, U+5470-5471, U+5474-5477, U+547b, U+547f-5481, U+5483-5486, U+5488-548b, U+548d-5492, U+5495-5496, U+549c, U+549f-54a2, U+54a4, U+54a6-54af, U+54b1, U+54b7-54bc, U+54be-54bf, U+54c2-54c4, U+54c6-54c8, U+54ca, U+54cd-54ce, U+54d8, U+54e0, U+54e2, U+54e5-54e6, U+54e8-54ea, U+54ec-54ef, U+54f1, U+54f3, U+54f6, U+54fc-5501, U+5505, U+5508-5509, U+550c-550f, U+5514-5516, U+5527, U+552a-552b, U+552e, U+5532-5533, U+5535-5536, U+5538-5539, U+553b-553d, U+5540-5541, U+5544-5545, U+5547, U+5549-554a, U+554c-554d, U+5550-5551, U+5556-5558, U+555a-555e, U+5560-5561, U+5563-5564, U+5566, U+557b-5583, U+5586-5588, U+558a, U+558e-558f, U+5591-5594, U+5597, U+5599, U+559e-559f, U+55a3-55a4, U+55a8-55a9, U+55ac-55ae, U+55b2, U+55bf, U+55c1, U+55c3-55c4, U+55c6-55c7, U+55c9, U+55cb-55cc, U+55ce, U+55d1-55d4, U+55d7-55d8, U+55da-55db, U+55dd-55df, U+55e2, U+55e4, U+55e9, U+55ec, U+55ee, U+55f1, U+55f6-55f9, U+55fd-55ff, U+5605, U+5607-5608, U+560a, U+560d-5612; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.47.woff2) format('woff2'); - unicode-range: U+528d, U+5291-5298, U+529a, U+529c, U+52a4-52a7, U+52ab-52ad, U+52af-52b0, U+52b5-52b8, U+52ba-52be, U+52c0-52c1, U+52c4-52c6, U+52c8, U+52ca, U+52cc-52cd, U+52cf-52d2, U+52d4, U+52d6-52d7, U+52db-52dc, U+52de, U+52e0-52e1, U+52e3, U+52e5-52e6, U+52e8-52ea, U+52ec, U+52f0-52f1, U+52f3-52fb, U+5300-5301, U+5303, U+5306-5308, U+530a-530d, U+530f-5311, U+5313, U+5315, U+5318-531f, U+5321, U+5323-5325, U+5327-532d, U+532f-5333, U+5335, U+5338, U+533c-533e, U+5340, U+5342, U+5345-5346, U+5349, U+534b-534c, U+5359, U+535b, U+535e, U+5361, U+5363-5367, U+5369, U+536c-536e, U+5372, U+5377, U+5379-537b, U+537d-537f, U+5382-5383, U+5387-5389, U+538e, U+5393-5394, U+5396, U+5398-5399, U+539d, U+53a0-53a1, U+53a4-53a6, U+53a9-53ab, U+53ad-53b0, U+53b2, U+53b4-53b8, U+53ba, U+53bd, U+53c0-53c1, U+53c3-53c5, U+53cf, U+53d2-53d3, U+53d5, U+53da-53db, U+53dd-53e0, U+53e2, U+53e6-53e8, U+53ed-53ee, U+53f4-53f5, U+53fa, U+5401-5403, U+540b, U+540f, U+5412-5413, U+541a, U+541d-541e, U+5421, U+5424, U+5427-542a, U+542c-542f, U+5431, U+5433-5436, U+543c-543d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.48.woff2) format('woff2'); - unicode-range: U+50dd-50df, U+50e1-50e6, U+50e8-50e9, U+50ed-50f6, U+50f9-50fb, U+50fe, U+5101-5103, U+5106-5109, U+510b-510e, U+5110, U+5112, U+5114-511e, U+5121, U+5123, U+5127-5128, U+512c-512d, U+512f, U+5131, U+5133-5135, U+5137-513c, U+513f-5142, U+5147, U+514a, U+514c, U+514f, U+5152-5155, U+5157-5158, U+515f-5160, U+5162, U+5164, U+5166-5167, U+5169-516a, U+516e, U+5173-5174, U+5179, U+517b, U+517e, U+5180, U+5182-5184, U+5189, U+518b-518c, U+518e-5191, U+5193, U+5195-5196, U+5198, U+519d, U+51a1-51a4, U+51a6, U+51a9-51ab, U+51ad, U+51b0-51b3, U+51b5, U+51b8, U+51ba, U+51bc-51bf, U+51c2-51c3, U+51c5, U+51c8-51cb, U+51cf, U+51d1-51d6, U+51d8, U+51de-51e0, U+51e2, U+51e5, U+51e7, U+51e9, U+51ec-51ee, U+51f2-51f5, U+51f7, U+51fe, U+5201-5202, U+5204-5205, U+520b, U+520e, U+5212-5216, U+5218, U+5222, U+5226-5228, U+522a-522b, U+522e, U+5231-5233, U+5235, U+523c, U+5244-5245, U+5249, U+524b-524c, U+524f, U+5254-5255, U+5257-5258, U+525a, U+525c-5261, U+5266, U+5269, U+526c, U+526e, U+5271, U+5273-5274, U+5277-5279, U+527d, U+527f-5280, U+5282-5285, U+5288-528a, U+528c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.49.woff2) format('woff2'); - unicode-range: U+4f57-4f58, U+4f5a-4f5b, U+4f5d-4f5f, U+4f63-4f64, U+4f69-4f6a, U+4f6c, U+4f6e-4f71, U+4f76-4f7e, U+4f81-4f85, U+4f88-4f8a, U+4f8c, U+4f8e-4f90, U+4f92-4f94, U+4f96-4f9a, U+4f9e-4fa0, U+4fab, U+4fad, U+4faf, U+4fb2, U+4fb7, U+4fb9, U+4fbb-4fbe, U+4fc0-4fc1, U+4fc4-4fc6, U+4fc8-4fc9, U+4fcb-4fd4, U+4fd8, U+4fda-4fdc, U+4fdf-4fe0, U+4fe2, U+4fe4-4fe6, U+4fef-4ff2, U+4ff6, U+4ffc-5002, U+5004-5007, U+500a, U+500c, U+500e-5011, U+5013-5014, U+5016-5018, U+501a-501e, U+5021-5023, U+5025-502a, U+502c-502e, U+5030, U+5032-5033, U+5035, U+5039, U+503b, U+5040-5043, U+5045-5048, U+504a, U+504c, U+504e, U+5050-5053, U+5055-5057, U+5059-505a, U+505f-5060, U+5062-5063, U+5066-5067, U+506a, U+506c-506d, U+5070-5072, U+5077-5078, U+5080-5081, U+5083-5086, U+5088, U+508a, U+508e-5090, U+5092-5096, U+509a-509c, U+509e-50a3, U+50aa, U+50ad, U+50af-50b4, U+50b9-50bb, U+50bd, U+50c0, U+50c2-50c4, U+50c7, U+50c9-50ca, U+50cc, U+50ce, U+50d0-50d1, U+50d3-50d4, U+50d6, U+50d8-50d9, U+50dc; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.50.woff2) format('woff2'); - unicode-range: U+4093, U+4103, U+4105, U+4148, U+414f, U+4163, U+41b4, U+41bf, U+41e6, U+41ee, U+41f3, U+4207, U+420e, U+4264, U+4293, U+42c6, U+42d6, U+42dd, U+4302, U+432b, U+4343, U+43ee, U+43f0, U+4408, U+440c, U+4417, U+441c, U+4422, U+4453, U+445b, U+4476, U+447a, U+4491, U+44b3, U+44be, U+44d4, U+4508, U+450d, U+4525, U+4543, U+457a, U+459d, U+45b8, U+45be, U+45e5, U+45ea, U+460f-4610, U+4641, U+4665, U+46a1, U+46ae-46af, U+470c, U+471f, U+4764, U+47e6, U+47fd, U+4816, U+481e, U+4844, U+484e, U+48b5, U+49b0, U+49e7, U+49fa, U+4a04, U+4a29, U+4abc, U+4b38, U+4b3b, U+4b7e, U+4bc2, U+4bca, U+4bd2, U+4be8, U+4c17, U+4c20, U+4c38, U+4cc4, U+4cd1, U+4ce1, U+4d07, U+4d77, U+4e02, U+4e04-4e05, U+4e0c, U+4e0f-4e12, U+4e15, U+4e17, U+4e19, U+4e1e-4e1f, U+4e23-4e24, U+4e28-4e2c, U+4e2e-4e31, U+4e35-4e37, U+4e3f-4e42, U+4e44, U+4e47-4e48, U+4e4d-4e4e, U+4e51, U+4e55-4e56, U+4e58, U+4e5a-4e5c, U+4e62-4e63, U+4e68-4e69, U+4e74-4e75, U+4e79, U+4e7f, U+4e82, U+4e85, U+4e8a, U+4e8d-4e8e, U+4e96-4e99, U+4e9d-4ea0, U+4ea2, U+4ea5-4ea6, U+4ea8, U+4eaf-4eb0, U+4eb3, U+4eb6, U+4eb9, U+4ebb-4ebc, U+4ec2-4ec4, U+4ec6-4ec8, U+4ecd, U+4ed0, U+4ed7, U+4eda-4edb, U+4edd-4ee2, U+4ee8, U+4eeb, U+4eed, U+4eef, U+4ef1, U+4ef3, U+4ef5, U+4ef7, U+4efc-4f00, U+4f02-4f03, U+4f08-4f09, U+4f0b-4f0d, U+4f12, U+4f15-4f17, U+4f19, U+4f1c, U+4f2b, U+4f2e, U+4f30-4f31, U+4f33, U+4f35-4f37, U+4f39, U+4f3b, U+4f3e, U+4f40, U+4f42-4f43, U+4f48-4f49, U+4f4b-4f4c, U+4f52, U+4f54, U+4f56; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.51.woff2) format('woff2'); - unicode-range: U+3395-339b, U+339e-33a0, U+33a2-33ff, U+3402, U+3405-3406, U+3427, U+342c, U+342e, U+3468, U+346a, U+3488, U+3492, U+34b5, U+34bc, U+34c1, U+34c7, U+34db, U+351f, U+353e, U+355d-355e, U+3563, U+356e, U+35a6, U+35a8, U+35c5, U+35da, U+35de, U+35f4, U+3605, U+3614, U+364a, U+3691, U+3696, U+3699, U+36cf, U+3761-3762, U+376b-376c, U+3775, U+378d, U+37c1, U+37e2, U+37e8, U+37f4, U+37fd, U+3800, U+382f, U+3836, U+3840, U+385c, U+3861, U+38a1, U+38ad, U+38fa, U+3917, U+391a, U+396f, U+39a4, U+39b8, U+3a5c, U+3a6e, U+3a73, U+3a85, U+3ac4, U+3acb, U+3ad6-3ad7, U+3aea, U+3af3, U+3b0e, U+3b1a, U+3b1c, U+3b22, U+3b35, U+3b6d, U+3b77, U+3b87-3b88, U+3b8d, U+3ba4, U+3bb6, U+3bc3, U+3bcd, U+3bf0, U+3bf3, U+3c0f, U+3c26, U+3cc3, U+3cd2, U+3d11, U+3d1e, U+3d31, U+3d4e, U+3d64, U+3d9a, U+3dc0, U+3dcc, U+3dd4, U+3e05, U+3e3f-3e40, U+3e60, U+3e66, U+3e68, U+3e83, U+3e8a, U+3e94, U+3eda, U+3f57, U+3f72, U+3f75, U+3f77, U+3fae, U+3fb1, U+3fc9, U+3fd7, U+3fdc, U+4039, U+4058; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.52.woff2) format('woff2'); - unicode-range: U+32b5-332b, U+332d-3394; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.53.woff2) format('woff2'); - unicode-range: U+31c8-31e3, U+31f0-321e, U+3220-3230, U+3232-32b4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.54.woff2) format('woff2'); - unicode-range: U+3028-303f, U+3094-3096, U+309f-30a0, U+30ee, U+30f7-30fa, U+30ff, U+3105-312f, U+3131-3163, U+3165-318e, U+3190-31bb, U+31c0-31c7; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.55.woff2) format('woff2'); - unicode-range: U+2f14-2fd5, U+2ff0-2ffb, U+3004, U+3013, U+3016-301b, U+301e, U+3020-3027; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.56.woff2) format('woff2'); - unicode-range: U+25e4-25e6, U+2601-2603, U+2609, U+260e-260f, U+2616-2617, U+261c-261f, U+262f, U+2641, U+2660, U+2662-2664, U+2666-2668, U+266d-266e, U+2672-267d, U+26bd-26be, U+2702, U+271a, U+273d, U+2740, U+2756, U+2776-2793, U+27a1, U+2934-2935, U+29bf, U+29fa-29fb, U+2b05-2b07, U+2b1a, U+2b95, U+2e3a-2e3b, U+2e80-2e99, U+2e9b-2ef3, U+2f00-2f13; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.57.woff2) format('woff2'); - unicode-range: U+24d1-24ff, U+2503-2513, U+2515-2516, U+2518-251b, U+251d-2522, U+2524-259f, U+25a2-25ab, U+25b1, U+25b7, U+25c0-25c1, U+25c9-25ca, U+25cc, U+25d0-25d3, U+25e2-25e3; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.58.woff2) format('woff2'); - unicode-range: U+2105, U+2109-210a, U+210f, U+2116, U+2121, U+2126-2127, U+212b, U+212e, U+2135, U+213b, U+2194-2199, U+21b8-21b9, U+21c4-21c6, U+21cb-21cc, U+21d0, U+21e6-21e9, U+21f5, U+2202-2203, U+2205-2206, U+2208-220b, U+220f, U+2211, U+2213, U+2215, U+221a, U+221d, U+2220, U+2223, U+2225-2226, U+2228, U+222a-222e, U+2234-2237, U+223d, U+2243, U+2245, U+2248, U+224c, U+2260, U+2262, U+2264-2265, U+226e-226f, U+2272-2273, U+2276-2277, U+2283-2287, U+228a-228b, U+2295-2299, U+22a0, U+22a5, U+22bf, U+22da-22db, U+22ef, U+2305-2307, U+2318, U+2329-232a, U+23b0-23b1, U+23be-23cc, U+23ce, U+23da-23db, U+2423, U+2469-24d0; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.59.woff2) format('woff2'); - unicode-range: U+a1-a4, U+a6-a7, U+aa, U+ac-ad, U+b5-b6, U+b8-ba, U+bc-c8, U+ca-cc, U+ce-d5, U+d9-db, U+dd-df, U+e6, U+ee, U+f0, U+f5, U+f7, U+f9, U+fb, U+fe-102, U+110-113, U+11a-11b, U+128-12b, U+143-144, U+147-148, U+14c, U+14e-14f, U+152-153, U+168-16d, U+192, U+1a0-1a1, U+1af, U+1cd-1dc, U+1f8-1f9, U+251, U+261, U+2bb, U+2c7, U+2c9, U+2ea-2eb, U+304, U+307, U+30c, U+1e3e-1e3f, U+1ea0-1ebe, U+1ec0-1ec6, U+1ec8-1ef9, U+2011-2012, U+2016, U+2018-201a, U+201e, U+2021, U+2030, U+2033, U+2035, U+2042, U+2047, U+2051, U+2074, U+20a9, U+20ab-20ac, U+20dd-20de, U+2100; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.60.woff2) format('woff2'); - unicode-range: U+2227, U+26a0, U+2713, U+301f, U+4ff8, U+5239, U+526a, U+54fa, U+5740, U+5937, U+5993, U+59fb, U+5a3c, U+5c41, U+6028, U+626e, U+646f, U+647a, U+64b0, U+64e2, U+65a7, U+66fe, U+6727, U+6955, U+6bef, U+6f23, U+724c, U+767c, U+7a83, U+7ac4, U+7b67, U+8000, U+8471, U+8513, U+8599, U+86db, U+8718, U+87f2, U+88f3, U+8ad2, U+8e2a, U+8fa3, U+95a5, U+9798, U+9910, U+9957, U+9bab, U+9c3b, U+9daf, U+ff95; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.61.woff2) format('woff2'); - unicode-range: U+a8, U+2032, U+2261, U+2282, U+3090, U+30f1, U+339c, U+535c, U+53d9, U+56a2, U+56c1, U+5806, U+589f, U+59d0, U+5a7f, U+60e0, U+639f, U+65af, U+68fa, U+69ae, U+6d1b, U+6ef2, U+71fb, U+725d, U+7262, U+75bc, U+7768, U+7940, U+79bf, U+7bed, U+7d68, U+7dfb, U+814b, U+8207, U+83e9, U+8494, U+8526, U+8568, U+85ea, U+86d9, U+87ba, U+8861, U+887f, U+8fe6, U+9059, U+9061, U+916a, U+976d, U+97ad, U+9ece; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.62.woff2) format('woff2'); - unicode-range: U+2d9, U+21d4, U+301d, U+515c, U+52fe, U+5420, U+5750, U+5766, U+5954, U+5b95, U+5f8a, U+5f98, U+620c, U+621f, U+641c, U+66d9, U+676d, U+6775, U+67f5, U+694a, U+6a02, U+6a3a, U+6a80, U+6c23, U+6c72, U+6dcb, U+6faa, U+707c, U+71c8, U+7422, U+74e2, U+7791, U+7825, U+7a14, U+7a1c, U+7c95, U+7fc1, U+82a5, U+82db, U+8304, U+853d, U+8cd3, U+8de8, U+8f0c, U+8f3f, U+9091, U+91c7, U+929a, U+98af, U+9913; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.63.woff2) format('woff2'); - unicode-range: U+2ca-2cb, U+2229, U+2468, U+2669, U+266f, U+273f, U+4ec0, U+4f60, U+4fb6, U+5347, U+540e, U+543b, U+5b0c, U+5d4c, U+5f14, U+5f9e, U+6155, U+62d0, U+6602, U+6666, U+66f3, U+67a2, U+67ca, U+69cc, U+6d29, U+6d9b, U+6e3e, U+6f81, U+7109, U+73c0, U+73c2, U+7425, U+7435-7436, U+7525, U+7554, U+785d, U+786b, U+7ae3, U+7b94, U+7d18, U+81bf, U+8511, U+8549, U+9075, U+9640, U+98e2, U+9e9f, U+ff96; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.64.woff2) format('woff2'); - unicode-range: U+2467, U+4ece, U+4ed4, U+4f91, U+4fae, U+534d, U+53c9, U+54b3, U+586b, U+5944, U+5b78, U+5df7, U+5f77, U+6101, U+6167-6168, U+61a4, U+62d9, U+698a, U+699b, U+6a59, U+6cc4, U+6e07, U+7099, U+75d2, U+77ad, U+7953, U+7984, U+7a92, U+7baa, U+7dbb, U+817f, U+82ad, U+85e9, U+868a, U+8caa, U+8f44, U+9017, U+907c, U+908a, U+92f3, U+936e, U+9435, U+978d, U+9838, U+9a28, U+9b41, U+9ba8, U+9c57, U+9eb9; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.65.woff2) format('woff2'); - unicode-range: U+b1, U+309b, U+4e5e, U+51f1, U+5506, U+55c5, U+58cc, U+59d1, U+5c51, U+5ef7, U+6284, U+62d7, U+6689, U+673d, U+6a2b, U+6a8e, U+6a9c, U+6d63, U+6dd1, U+70b8, U+7235, U+72db, U+72f8, U+7560, U+7c9b, U+7ce7, U+7e1e, U+80af, U+82eb, U+8463, U+8499, U+85dd, U+86ee, U+8a60, U+8a6e, U+8c79, U+8e87, U+8e8a, U+8f5f, U+9010, U+918d, U+9190, U+965b, U+97fb, U+9ab8, U+9bad, U+9d3b, U+9d5c, U+9dfa, U+9e93; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.66.woff2) format('woff2'); - unicode-range: U+2020, U+3003, U+3231, U+4e9b, U+4f3d, U+4f47, U+51b6, U+51dc, U+53e1, U+5bc5, U+602f, U+60bc, U+61c9, U+633d, U+637b, U+6492, U+65fa, U+660f, U+66f0, U+6703, U+681e, U+6876, U+6893, U+6912, U+698e, U+6c7d, U+714c, U+7169, U+71d5, U+725f, U+72d7, U+745b, U+74dc, U+75e2, U+7891, U+7897, U+7dcb, U+810a, U+8218, U+8339, U+840e, U+852d, U+8823, U+8a0a, U+9089, U+919c, U+971c, U+9ad9, U+ff4a, U+ff5a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.67.woff2) format('woff2'); - unicode-range: U+2466, U+2600, U+4eab, U+4fe3, U+4ff5, U+51a5, U+51f0, U+536f, U+53d4, U+53f1, U+54a5, U+559d, U+55e3, U+58fa, U+5962, U+59ea, U+5c16, U+5cef, U+5d16, U+5f10, U+5fd6, U+6190, U+6216, U+634f, U+63bb, U+66d6, U+6756, U+6bc5, U+6e26, U+727d, U+731f, U+76f2, U+7729, U+7a7f, U+7aff, U+7c9f, U+818f, U+8236, U+82b9, U+8338, U+85aa, U+88b4, U+8b33, U+904d, U+93a7, U+96cc, U+96eb, U+9aed, U+9b8e, U+fa11; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.68.woff2) format('woff2'); - unicode-range: U+251c, U+2523, U+4e14, U+545f, U+54bd, U+553e, U+55dc, U+56da, U+589c, U+5b55, U+5bb5, U+5ce1, U+5df4, U+5eb6, U+5ec9, U+6191, U+62f7, U+6357, U+64a5, U+6591, U+65bc, U+6897, U+6e1a, U+7063, U+711a, U+721b, U+722c, U+75b9, U+75d5, U+75fa, U+7766, U+7aae, U+7b48, U+7b8b, U+7d21, U+7e55, U+7f75, U+842c, U+8910, U+8a63, U+8b39, U+8b5a, U+8cdc, U+8d74, U+907d, U+91e7, U+9306, U+96bc, U+98f4, U+9ac4; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.69.woff2) format('woff2'); - unicode-range: U+2003, U+2312, U+266c, U+4f86, U+51ea, U+5243, U+5256, U+541f, U+5841, U+59dc, U+5df3, U+601c, U+60e7, U+632b, U+638c, U+64ad, U+6881, U+697c, U+69cd, U+6c50, U+6d2a, U+6fc1, U+7027, U+7058, U+70f9, U+714e, U+7345, U+751a, U+760d, U+764c, U+77db, U+7d79, U+7e8f, U+80ce, U+814e, U+81fc, U+8247, U+8278, U+85a9, U+8a03, U+90ed, U+9784, U+9801, U+984e, U+99b3, U+9bc9, U+9bdb, U+9be8, U+9e78, U+ff6b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.70.woff2) format('woff2'); - unicode-range: U+266b, U+3006, U+5176, U+5197, U+51a8, U+51c6, U+52f2, U+5614, U+5875, U+5a2f, U+5b54, U+5ce0, U+5dba, U+5deb, U+5e63, U+5f59, U+5fcc, U+6068, U+6367, U+68b6, U+6a0b, U+6b64, U+6e15, U+6eba, U+7272, U+72a0, U+7947, U+7985, U+79e6, U+79e9, U+7a3d, U+7a9f, U+7aaf, U+7b95, U+7f60, U+7f9e, U+7fe0, U+8098, U+80ba, U+8106, U+82d4, U+831c, U+87f9, U+8a1f, U+8acf, U+90c1, U+920d, U+9756, U+fe43, U+ff94; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.71.woff2) format('woff2'); - unicode-range: U+af, U+2465, U+2517, U+33a1, U+4f10, U+50c5, U+51b4, U+5384, U+5606, U+5bb0, U+5cac, U+5ee3, U+618e, U+61f2, U+62c9, U+66ab, U+66f9, U+6816, U+6960, U+6b3e, U+6f20, U+7078, U+72d0, U+73ed, U+7ad9, U+7b1b, U+7be4, U+7d62, U+7f51, U+80b4, U+80f4, U+8154, U+85fb, U+865c, U+8702, U+895f, U+8aed, U+8b90, U+8ced, U+8fbf, U+91d8, U+9418, U+9583, U+9591, U+9813, U+982c, U+9bd6, U+ff46, U+ff7f, U+ff88; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.72.woff2) format('woff2'); - unicode-range: U+4e91, U+508d, U+50e7, U+514e, U+51f6, U+5446, U+5504, U+584a, U+59a8, U+59d3, U+5a46, U+5ac9, U+6020, U+60a6, U+6148, U+621a, U+6234, U+64c1, U+6523, U+675c, U+67d1, U+6953, U+6ccc, U+6df5, U+6e13, U+6f06, U+723a, U+7325, U+74e6, U+758e, U+75ab, U+75d9, U+7a40, U+8096, U+82fa, U+8587, U+8594, U+8a6b, U+8ab9, U+8b17, U+8b83, U+937c, U+963b, U+9673, U+96db, U+9ce9, U+9f4b, U+ff67, U+ff82, U+ff93; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.73.woff2) format('woff2'); - unicode-range: U+221e, U+2514, U+51f9, U+5270, U+5449, U+5824, U+59a5, U+5a29, U+5d07, U+5e16, U+60e3, U+614c, U+6276, U+643e, U+64ab, U+6562, U+6681, U+670b, U+6734, U+67af, U+6a3d, U+6b05, U+6dc0, U+6e4a, U+7259, U+732a, U+7409, U+78a7, U+7a6b, U+8015, U+809b, U+817a, U+830e, U+837b, U+85ab, U+8a23, U+8a93, U+8b00, U+8b19, U+8b21, U+8cbf, U+8fb0, U+901d, U+91b8, U+9320, U+932c, U+9688, U+96f6, U+9df2, U+ff6a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.74.woff2) format('woff2'); - unicode-range: U+2002, U+2025, U+4f8d, U+51e1, U+51f8, U+5507, U+5598, U+58f1, U+5983, U+59ac, U+5c3c, U+5de7, U+5e7d, U+5eca, U+5f61, U+606d, U+60f9, U+636e, U+64ec, U+67da, U+67ff, U+6813, U+68f2, U+693f, U+6b6a, U+6bbb, U+6ef4, U+7092, U+717d, U+7261, U+73c8, U+7432, U+7483, U+76fe, U+7709, U+78d0, U+81a3, U+81b3, U+82af, U+8305, U+8309, U+8870, U+88fe, U+8cd1, U+8d66, U+906e, U+971e, U+9812, U+ff79, U+ff90; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.75.woff2) format('woff2'); - unicode-range: U+2464, U+2501, U+2640, U+2642, U+339d, U+4f0e, U+5091, U+50b5, U+5132, U+51cc, U+558b, U+55aa, U+585e, U+5bee, U+5dfe, U+60b6, U+62b9, U+6349, U+6566, U+6590, U+6842, U+689d, U+6a58, U+6c70, U+6ff1, U+7815, U+7881, U+7aaa, U+7bc7, U+7def, U+7fa8, U+8017, U+8036, U+8061, U+821f, U+8429, U+8ce0, U+8e74, U+9019, U+90ca, U+9162, U+932f, U+93ae, U+9644, U+990c, U+9cf3, U+ff56, U+ff6e, U+ff7e, U+ff85; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.76.woff2) format('woff2'); - unicode-range: U+2266-2267, U+4f2f, U+5208, U+5451, U+546a, U+5589, U+576a, U+5815, U+5a9a, U+5b9b, U+5c3a, U+5efb, U+5faa, U+6109, U+6643, U+6652, U+695a, U+69fd, U+6b86, U+6bb4, U+6daf, U+7089, U+70cf, U+7a00, U+7a4f, U+7b39, U+7d33, U+80e1, U+828b, U+82a6, U+86cd, U+8c8c, U+8cca, U+8df3, U+9077, U+9175, U+91dc, U+925b, U+9262, U+9271, U+92ed, U+9855, U+9905, U+9d28, U+ff3f, U+ff58, U+ff68, U+ff6d, U+ff9c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.77.woff2) format('woff2'); - unicode-range: U+2207, U+25ef, U+309c, U+4e4f, U+5146, U+51dd, U+5351, U+540a, U+5629, U+5eb5, U+5f04, U+5f13, U+60dc, U+6212, U+63b4, U+642c, U+6627, U+66a6, U+66c7, U+66fd, U+674e, U+6b96, U+6c4e, U+6df3, U+6e67, U+6f84, U+72fc, U+733f, U+7c97, U+7db1, U+7e4d, U+816b, U+82d1, U+84cb, U+854e, U+8607, U+86c7, U+871c, U+8776, U+8a89, U+8fc4, U+91a4, U+9285, U+9685, U+9903, U+9b31, U+9f13, U+ff42, U+ff74, U+ff91; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.78.woff2) format('woff2'); - unicode-range: U+4e32, U+51db, U+53a8, U+53ea, U+5609, U+5674, U+5a92, U+5e7e, U+6115, U+611a, U+62cc, U+62ed, U+63c9, U+64b9, U+64e6, U+65cb, U+6606, U+6731, U+683d, U+6afb, U+7460, U+771e, U+78ef, U+7b26, U+7b51, U+7cde, U+7d10, U+7d2f, U+7d46, U+80de, U+819c, U+84b2, U+85cd, U+865a, U+8ecc, U+9022, U+90b8, U+9192, U+9675, U+96b7, U+99ff, U+ff44, U+ff55, U+ff6c, U+ff73, U+ff75, U+ff86, U+ff8d, U+ff92, U+ffe3; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.79.woff2) format('woff2'); - unicode-range: U+25b3, U+30f5, U+4eae, U+4f46, U+4f51, U+5203, U+52ff, U+55a7, U+564c, U+565b, U+57f9, U+5805, U+5b64, U+5e06, U+5f70, U+5f90, U+60e8, U+6182, U+62f3, U+62fe, U+63aa, U+64a4, U+65d7, U+673a, U+6851, U+68cb, U+68df, U+6d1e, U+6e58, U+6e9d, U+77b3, U+7832, U+7c3f, U+7db4, U+7f70, U+80aa, U+80c6, U+8105, U+819d, U+8276, U+8679, U+8986, U+8c9d, U+8fc5, U+916c, U+9665, U+9699, U+96c0, U+9a19, U+ff8b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.80.woff2) format('woff2'); - unicode-range: U+2463, U+25a1, U+4ef0, U+5076, U+5098, U+51fd, U+5302, U+5448, U+54c9, U+570b, U+583a, U+5893, U+58a8, U+58ee, U+5949, U+5bdb, U+5f26, U+5f81, U+6052, U+6170, U+61c7, U+631f, U+635c, U+664b, U+69fb, U+6f01, U+7070, U+722a, U+745e, U+755c, U+76c6, U+78c1, U+79e4, U+7bb8, U+7d0b, U+81a8, U+82d7, U+8b5c, U+8f14, U+8fb1, U+8fbb, U+9283, U+9298, U+9a30, U+ff03, U+ff50, U+ff59, U+ff7b, U+ff8e-ff8f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.81.woff2) format('woff2'); - unicode-range: U+2010, U+2502, U+25b6, U+4f3a, U+514b, U+5265, U+52c3, U+5339, U+53ec, U+54c0, U+55b0, U+5854, U+5b8f, U+5cb3, U+5e84, U+60da, U+6247, U+6249, U+628a, U+62cd, U+65ac, U+6838, U+690e, U+6cf0, U+6f02, U+6f2c, U+6f70, U+708a, U+7434, U+75be, U+77ef, U+7c60, U+7c98, U+7d1b, U+7e2b, U+80a5, U+81e3, U+820c, U+8210, U+8475, U+862d, U+8650, U+8997, U+906d, U+91c8, U+9700, U+9727, U+9df9, U+ff3a, U+ff9a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.82.woff2) format('woff2'); - unicode-range: U+2103, U+5049, U+52b1, U+5320, U+5553, U+572d, U+58c7, U+5b5d, U+5bc2, U+5de3, U+5e61, U+5f80, U+61a9, U+67d0, U+67f4, U+6c88, U+6ca1, U+6ce5, U+6d78, U+6e9c, U+6f54, U+731b, U+73b2, U+74a7, U+74f6, U+75e9, U+7b20, U+7c8b, U+7f72, U+809d, U+8108, U+82b3, U+82bd, U+84b8, U+84c4, U+88c2, U+8ae6, U+8ef8, U+902e, U+9065, U+9326, U+935b, U+938c, U+9676, U+9694, U+96f7, U+9ed9, U+ff48, U+ff4c, U+ff81; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.83.woff2) format('woff2'); - unicode-range: U+2500, U+3008-3009, U+4ead, U+4f0f, U+4fca, U+53eb, U+543e, U+57a2, U+5cf0, U+5e8f, U+5fe0, U+61b2, U+62d8, U+6442, U+64b2, U+6589, U+659c, U+67f1, U+68c4, U+6cb8, U+6d12, U+6de1, U+6fe1, U+70c8, U+723d, U+73e0, U+7656, U+773a, U+7948, U+7b87, U+7c92, U+7d3a, U+7e1b, U+7e4a, U+819a, U+8358, U+83c5, U+84bc, U+864e, U+8912, U+8c9e, U+8d05, U+92fc, U+9396, U+98fd, U+99d2, U+ff64, U+ff7a, U+ff83; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.84.woff2) format('woff2'); - unicode-range: U+3014-3015, U+4e3c, U+5036, U+5075, U+533f, U+53e9, U+5531, U+5642, U+5984, U+59e6, U+5a01, U+5b6b, U+5c0b, U+5f25, U+6069, U+60a0, U+614e, U+62b5, U+62d2-62d3, U+6597, U+660c, U+674f, U+67cf, U+6841, U+6905, U+6cf3, U+6d32, U+6d69, U+6f64, U+716e, U+7761, U+7b52, U+7be0, U+7dbf, U+7de9, U+7f36, U+81d3, U+8302, U+8389, U+846c, U+84ee, U+8a69, U+9038, U+9d8f, U+ff47, U+ff4b, U+ff76, U+ff9b; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.85.woff2) format('woff2'); - unicode-range: U+25c7, U+3007, U+504f, U+507d, U+51a0, U+52a3, U+5410, U+5510, U+559a, U+5782, U+582a, U+5c0a, U+5c3f, U+5c48, U+5f6b, U+6176, U+622f, U+6279, U+62bd, U+62dd, U+65ed, U+67b6, U+6817, U+6850, U+6d6a, U+6deb, U+6ea2, U+6edd, U+6f5c, U+72e9, U+73a9, U+7573, U+76bf, U+7950, U+7956, U+7f8a, U+7ffc, U+80a2, U+80c3, U+83ca, U+8a02, U+8a13, U+8df5, U+9375, U+983b, U+99b4, U+ff4e, U+ff71, U+ff89, U+ff97; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.86.woff2) format('woff2'); - unicode-range: U+24, U+2022, U+2212, U+221f, U+2665, U+4ecf, U+5100, U+51cd, U+52d8, U+5378, U+53f6, U+574a, U+5982, U+5996, U+5c1a, U+5e1d, U+5f84, U+609f, U+61a7, U+61f8, U+6398, U+63ee, U+6676, U+6691, U+6eb6, U+7126, U+71e5, U+7687, U+7965, U+7d17, U+80a1, U+8107, U+8266, U+85a6, U+8987, U+8ca2, U+8cab, U+8e0a, U+9042, U+95c7, U+9810, U+9867, U+98fc, U+ff52-ff54, U+ff61, U+ff77, U+ff98-ff99; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.87.woff2) format('woff2'); - unicode-range: U+b0, U+226a, U+2462, U+4e39, U+4fc3, U+4fd7, U+50be, U+50da, U+5200, U+5211, U+54f2, U+5618, U+596a, U+5b22, U+5bb4, U+5d50, U+60a3, U+63fa, U+658e, U+65e8, U+6669, U+6795, U+679d, U+67a0, U+6b3a, U+6e09, U+757f, U+7cd6, U+7dbe, U+7ffb, U+83cc, U+83f1, U+840c, U+845b, U+8846, U+8972, U+8a34, U+8a50, U+8a87, U+8edf, U+8ff0, U+90a6, U+9154, U+95a3, U+9663, U+9686, U+96c7, U+ff3c, U+ff7c, U+ff8a; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.88.woff2) format('woff2'); - unicode-range: U+25bd, U+4e59, U+4ec1, U+4ff3, U+515a, U+518a, U+525b, U+5375, U+552f, U+57a3, U+5b9c, U+5c3d, U+5e3d, U+5e7b, U+5f0a, U+6094, U+6458, U+654f, U+67f3, U+6b8a, U+6bd2, U+6c37, U+6ce1, U+6e56, U+6e7f, U+6ed1, U+6ede, U+6f0f, U+70ad, U+7267, U+7363, U+786c, U+7a42, U+7db2, U+7f85, U+8178, U+829d, U+8896, U+8c5a, U+8cb0, U+8ce2, U+8ed2, U+9047, U+9177, U+970a, U+9ea6, U+ff1b, U+ff31, U+ff39, U+ff80; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.89.woff2) format('woff2'); - unicode-range: U+a5, U+4e80, U+4f34, U+4f73, U+4f75, U+511f, U+5192, U+52aa, U+53c8, U+570f, U+57cb, U+596e, U+5d8b, U+5f66, U+5fd9, U+62db, U+62f6, U+6328, U+633f, U+63a7, U+6469, U+6bbf, U+6c41, U+6c57, U+6d44, U+6dbc, U+706f, U+72c2, U+72ed, U+7551, U+75f4, U+7949, U+7e26, U+7fd4, U+8150, U+8af8, U+8b0e, U+8b72, U+8ca7, U+934b, U+9a0e, U+9a12, U+9b42, U+ff41, U+ff43, U+ff45, U+ff49, U+ff4f, U+ff62-ff63; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.90.woff2) format('woff2'); - unicode-range: U+4e18, U+4fb5, U+5104, U+52c7, U+5353, U+5374, U+53e5, U+587e, U+594f, U+5a20, U+5de1, U+5f18, U+5fcd, U+6291, U+62ab, U+6355, U+6392, U+63da, U+63e1, U+656c, U+6687, U+68b0-68b1, U+68d2, U+68da, U+6b27, U+6cbc, U+7159, U+7344, U+73cd, U+76df, U+790e, U+7cf8, U+8102, U+88c1, U+8aa0, U+8e0f, U+9178, U+92ad, U+9670, U+96c5, U+9cf4, U+9db4, U+ff3e, U+ff6f, U+ff72, U+ff78, U+ff7d, U+ff84, U+ff8c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.91.woff2) format('woff2'); - unicode-range: U+60, U+2200, U+226b, U+2461, U+517c, U+526f, U+5800, U+5b97, U+5bf8, U+5c01, U+5d29, U+5e4c, U+5e81, U+6065, U+61d0, U+667a, U+6696, U+6843, U+6c99, U+6d99, U+6ec5, U+6f22, U+6f6e, U+6fa4, U+6fef, U+71c3, U+72d9, U+7384, U+78e8, U+7a1a, U+7a32, U+7a3c, U+7adc, U+7ca7, U+7d2b, U+7dad, U+7e4b, U+80a9, U+8170, U+81ed, U+820e, U+8a17, U+8afe, U+90aa, U+914e, U+963f, U+99c4, U+9eba, U+9f3b, U+ff38; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.92.woff2) format('woff2'); - unicode-range: U+2460, U+4e5f, U+4e7e, U+4ed9, U+501f, U+502b, U+5968, U+5974, U+5ac1, U+5b99, U+5ba3, U+5be7, U+5be9, U+5c64, U+5cb8, U+5ec3, U+5f1f, U+616e, U+6297, U+62e0, U+62ec, U+6368, U+642d, U+65e6, U+6717, U+676f, U+6b04, U+732e, U+7652, U+76ca, U+76d7, U+7802, U+7e70, U+7f6a, U+8133, U+81e8, U+866b, U+878d, U+88f8, U+8a5e, U+8cdb, U+8d08, U+907a, U+90e1, U+96f2, U+9f8d, U+ff35, U+ff37, U+ff40, U+ff9d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.93.woff2) format('woff2'); - unicode-range: U+21d2, U+25ce, U+300a-300b, U+4e89, U+4e9c, U+4ea1, U+5263, U+53cc, U+5426, U+5869, U+5947, U+598a, U+5999, U+5e55, U+5e72, U+5e79, U+5fae, U+5fb9, U+602a, U+6163, U+624d, U+6749, U+6c5a, U+6cbf, U+6d45, U+6dfb, U+6e7e, U+708e, U+725b, U+7763, U+79c0, U+7bc4, U+7c89, U+7e01, U+7e2e, U+8010, U+8033, U+8c6a, U+8cc3, U+8f1d, U+8f9b, U+8fb2, U+907f, U+90f7, U+9707, U+9818, U+9b3c, U+ff0a, U+ff4d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.94.woff2) format('woff2'); - unicode-range: U+2015, U+2190, U+4e43, U+5019, U+5247, U+52e7, U+5438, U+54b2, U+55ab, U+57f7, U+5bd2, U+5e8a, U+5ef6, U+6016, U+60b2, U+6162, U+6319, U+6551, U+6607, U+66b4, U+675f, U+67d4, U+6b20, U+6b53, U+6ce3, U+719f, U+75b2, U+770b, U+7720, U+77ac, U+79d2, U+7af9, U+7d05, U+7dca, U+8056, U+80f8, U+81f3, U+8352, U+885d, U+8a70, U+8aa4, U+8cbc, U+900f, U+9084, U+91e3, U+9451, U+96c4, U+99c6, U+9ad4, U+ff70; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.95.woff2) format('woff2'); - unicode-range: U+2193, U+25b2, U+4e4b, U+516d, U+51c4, U+529f, U+52c9, U+5360, U+5442, U+5857, U+5915, U+59eb, U+5a9b, U+5c3b, U+6012, U+61b6, U+62b1, U+6311, U+6577, U+65e2, U+65ec, U+6613, U+6790, U+6cb9, U+7372, U+76ae, U+7d5e, U+7fcc, U+88ab, U+88d5, U+8caf, U+8ddd, U+8ecd, U+8f38, U+8f9e, U+8feb, U+9063, U+90f5, U+93e1, U+968a, U+968f, U+98fe, U+9ec4, U+ff1d, U+ff27, U+ff2a, U+ff36, U+ff3b, U+ff3d, U+ffe5; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.96.woff2) format('woff2'); - unicode-range: U+4e03, U+4f38, U+50b7, U+5264, U+5348, U+5371, U+585a, U+58ca, U+5951, U+59b9, U+59d4, U+5b98, U+5f8b, U+6388, U+64cd, U+65e7, U+6803, U+6b6f, U+6d66, U+6e0b, U+6ecb, U+6fc3, U+72ac, U+773c, U+77e2, U+7968, U+7a74, U+7dba, U+7dd1, U+7e3e, U+808c, U+811a, U+8179, U+8239, U+8584, U+8a0e, U+8a72, U+8b66, U+8c46, U+8f29, U+90a3, U+9234, U+96f0, U+9769, U+9774, U+9aa8, U+ff26, U+ff28, U+ff9e-ff9f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.97.woff2) format('woff2'); - unicode-range: U+7e, U+b4, U+25c6, U+2661, U+4e92, U+4eee, U+4ffa, U+5144, U+5237, U+5287, U+52b4, U+58c1, U+5bff, U+5c04, U+5c06, U+5e95, U+5f31, U+5f93, U+63c3, U+640d, U+6557, U+6614, U+662f, U+67d3, U+690d, U+6bba, U+6e6f, U+72af, U+732b, U+7518, U+7ae0, U+7ae5, U+7af6, U+822a, U+89e6, U+8a3a, U+8a98, U+8cb8, U+8de1, U+8e8d, U+95d8, U+961c, U+96a3, U+96ea, U+9bae, U+ff20, U+ff22, U+ff29, U+ff2b-ff2c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.98.woff2) format('woff2'); - unicode-range: U+25cb, U+4e71, U+4f59, U+50d5, U+520a, U+5217, U+5230, U+523a-523b, U+541b, U+5439, U+5747, U+59c9, U+5bdf, U+5c31, U+5de8, U+5e7c, U+5f69, U+6050, U+60d1, U+63cf, U+663c, U+67c4, U+6885, U+6c38, U+6d6e, U+6db2, U+6df7, U+6e2c, U+6f5f, U+7532, U+76e3-76e4, U+7701, U+793c, U+79f0, U+7a93, U+7d00, U+7de0, U+7e54, U+8328, U+8840, U+969c, U+96e8, U+9811, U+9aea, U+9b5a, U+ff24, U+ff2e, U+ff57; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.99.woff2) format('woff2'); - unicode-range: U+2191, U+505c, U+52e4, U+5305, U+535a, U+56e0, U+59bb, U+5acc, U+5b09, U+5b87, U+5c90, U+5df1, U+5e2d, U+5e33, U+5f3e, U+6298, U+6383, U+653b, U+6697, U+6804, U+6a39, U+6cca, U+6e90, U+6f2b, U+702c, U+7206, U+7236, U+7559, U+7565, U+7591, U+75c7, U+75db, U+7b4b, U+7bb1, U+7d99, U+7fbd, U+8131, U+885b, U+8b1d, U+8ff7, U+9003, U+9045, U+96a0, U+9732, U+990a, U+99d0, U+9e97, U+9f62, U+ff25, U+ff2d; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.100.woff2) format('woff2'); - unicode-range: U+4e08, U+4f9d, U+5012, U+514d, U+51b7, U+5275, U+53ca, U+53f8, U+5584, U+57fc, U+5b9d, U+5bfa, U+5c3e, U+5f01, U+5fb4, U+5fd7, U+606f, U+62e1, U+6563, U+6674, U+6cb3, U+6d3e, U+6d74, U+6e1b, U+6e2f, U+718a, U+7247, U+79d8, U+7d14, U+7d66, U+7d71, U+7df4, U+7e41, U+80cc, U+8155, U+83d3, U+8a95, U+8ab2, U+8ad6, U+8ca1, U+9000, U+9006, U+9678, U+97d3, U+9808, U+98ef, U+9a5a, U+9b45, U+ff23, U+ff30; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.101.woff2) format('woff2'); - unicode-range: U+25bc, U+3012, U+4ef2, U+4f0a, U+516b, U+5373, U+539a, U+53b3, U+559c, U+56f0, U+5727, U+5742, U+5965, U+59ff, U+5bc6, U+5dfb, U+5e45, U+5ead, U+5fb3, U+6211, U+6253, U+639b, U+63a8, U+6545, U+6575, U+6628, U+672d, U+68a8, U+6bdb, U+6d25, U+707d, U+767e, U+7834, U+7b46, U+7bc9, U+8074, U+82e6, U+8349, U+8a2a, U+8d70, U+8da3, U+8fce, U+91cc, U+967d, U+97ff, U+9996, U+ff1c, U+ff2f, U+ff32, U+ff34; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.102.woff2) format('woff2'); - unicode-range: U+3d, U+5e, U+25cf, U+4e0e, U+4e5d, U+4e73, U+4e94, U+4f3c, U+5009, U+5145, U+51ac, U+5238, U+524a, U+53f3, U+547c, U+5802, U+5922, U+5a66, U+5c0e, U+5de6, U+5fd8, U+5feb, U+6797, U+685c, U+6b7b, U+6c5f-6c60, U+6cc9, U+6ce2, U+6d17, U+6e21, U+7167, U+7642, U+76db, U+8001, U+821e, U+8857, U+89d2, U+8b1b, U+8b70, U+8cb4, U+8cde, U+8f03, U+8f2a, U+968e, U+9b54, U+9e7f, U+9ebb, U+ff05, U+ff33; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.103.woff2) format('woff2'); - unicode-range: U+500d, U+5074, U+50cd, U+5175, U+52e2, U+5352, U+5354, U+53f2, U+5409, U+56fa, U+5a18, U+5b88, U+5bdd, U+5ca9, U+5f92, U+5fa9, U+60a9, U+623f, U+6483, U+653f, U+666f, U+66ae, U+66f2, U+6a21, U+6b66, U+6bcd, U+6d5c, U+796d, U+7a4d, U+7aef, U+7b56, U+7b97, U+7c4d, U+7e04, U+7fa9, U+8377, U+83dc, U+83ef, U+8535, U+8863, U+88cf, U+88dc, U+8907, U+8acb, U+90ce, U+91dd, U+ff0b, U+ff0d, U+ff19, U+ff65; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.104.woff2) format('woff2'); - unicode-range: U+4e01, U+4e21, U+4e38, U+52a9, U+547d, U+592e, U+5931, U+5b63, U+5c40, U+5dde, U+5e78, U+5efa, U+5fa1, U+604b, U+6075, U+62c5, U+632f, U+6a19, U+6c0f, U+6c11, U+6c96, U+6e05, U+70ba, U+71b1, U+7387, U+7403, U+75c5, U+77ed, U+795d, U+7b54, U+7cbe, U+7d19, U+7fa4, U+8089, U+81f4, U+8208, U+8336, U+8457, U+8a33, U+8c4a, U+8ca0, U+8ca8, U+8cc0, U+9014, U+964d, U+9803, U+983c, U+98db, U+ff17, U+ff21; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.105.woff2) format('woff2'); - unicode-range: U+25, U+25a0, U+4e26, U+4f4e, U+5341, U+56f2, U+5bbf, U+5c45, U+5c55, U+5c5e, U+5dee, U+5e9c, U+5f7c, U+6255, U+627f, U+62bc, U+65cf, U+661f, U+666e, U+66dc, U+67fb, U+6975, U+6a4b, U+6b32, U+6df1, U+6e29, U+6fc0, U+738b, U+7686, U+7a76, U+7a81, U+7c73, U+7d75, U+7dd2, U+82e5, U+82f1, U+85ac, U+888b, U+899a, U+8a31, U+8a8c, U+8ab0, U+8b58, U+904a, U+9060, U+9280, U+95b2, U+984d, U+9ce5, U+ff18; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.106.woff2) format('woff2'); - unicode-range: U+30f6, U+50ac, U+5178, U+51e6, U+5224, U+52dd, U+5883, U+5897, U+590f, U+5a5a, U+5bb3, U+5c65, U+5e03, U+5e2b, U+5e30, U+5eb7, U+6271, U+63f4, U+64ae, U+6574, U+672b, U+679a, U+6a29-6a2a, U+6ca2, U+6cc1, U+6d0b, U+713c, U+74b0, U+7981, U+7a0b, U+7bc0, U+7d1a, U+7d61, U+7fd2, U+822c, U+8996, U+89aa, U+8cac, U+8cbb, U+8d77, U+8def, U+9020, U+9152, U+9244, U+9662, U+967a, U+96e3, U+9759, U+ff16; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.107.woff2) format('woff2'); - unicode-range: U+23, U+3c, U+2192, U+4e45, U+4efb, U+4f50, U+4f8b, U+4fc2, U+5024, U+5150, U+5272, U+5370, U+53bb, U+542b, U+56db, U+56e3, U+57ce, U+5bc4, U+5bcc, U+5f71, U+60aa, U+6238, U+6280, U+629c, U+6539, U+66ff, U+670d, U+677e-677f, U+6839, U+69cb, U+6b4c, U+6bb5, U+6e96, U+6f14, U+72ec, U+7389, U+7814, U+79cb, U+79d1, U+79fb, U+7a0e, U+7d0d, U+85e4, U+8d64, U+9632, U+96e2, U+9805, U+99ac, U+ff1e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.108.woff2) format('woff2'); - unicode-range: U+2605-2606, U+301c, U+4e57, U+4fee, U+5065, U+52df, U+533b, U+5357, U+57df, U+58eb, U+58f0, U+591c, U+592a-592b, U+5948, U+5b85, U+5d0e, U+5ea7, U+5ff5, U+6025, U+63a1, U+63a5, U+63db, U+643a, U+65bd, U+671d, U+68ee, U+6982, U+6b73, U+6bd4, U+6d88, U+7570, U+7b11, U+7d76, U+8077, U+8217, U+8c37, U+8c61, U+8cc7, U+8d85, U+901f, U+962a, U+9802, U+9806, U+9854, U+98f2, U+9928, U+99c5, U+9ed2; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.109.woff2) format('woff2'); - unicode-range: U+266a, U+4f11, U+533a, U+5343, U+534a, U+53cd, U+5404, U+56f3, U+5b57-5b58, U+5bae, U+5c4a, U+5e0c, U+5e2f, U+5eab, U+5f35, U+5f79, U+614b, U+6226, U+629e, U+65c5, U+6625, U+6751, U+6821, U+6b69, U+6b8b, U+6bce, U+6c42, U+706b, U+7c21, U+7cfb, U+805e, U+80b2, U+82b8, U+843d, U+8853, U+88c5, U+8a3c, U+8a66, U+8d8a, U+8fba, U+9069, U+91cf, U+9752, U+975e, U+9999, U+ff0f-ff10, U+ff14-ff15; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.110.woff2) format('woff2'); - unicode-range: U+40, U+4e86, U+4e95, U+4f01, U+4f1d, U+4fbf, U+5099, U+5171, U+5177, U+53cb, U+53ce, U+53f0, U+5668, U+5712, U+5ba4, U+5ca1, U+5f85, U+60f3, U+653e, U+65ad, U+65e9, U+6620, U+6750, U+6761, U+6b62, U+6b74, U+6e08, U+6e80, U+7248, U+7531, U+7533, U+753a, U+77f3, U+798f, U+7f6e, U+8449, U+88fd, U+89b3, U+8a55, U+8ac7, U+8b77, U+8db3, U+8efd, U+8fd4, U+9031-9032, U+9580, U+9589, U+96d1, U+985e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.111.woff2) format('woff2'); - unicode-range: U+2b, U+d7, U+300e-300f, U+4e07, U+4e8c, U+512a, U+5149, U+518d, U+5236, U+52b9, U+52d9, U+5468, U+578b, U+57fa, U+5b8c, U+5ba2, U+5c02, U+5de5, U+5f37, U+5f62, U+623b, U+63d0, U+652f, U+672a, U+6848, U+6d41, U+7136, U+7537, U+754c, U+76f4, U+79c1, U+7ba1, U+7d44, U+7d4c, U+7dcf, U+7dda, U+7de8, U+82b1, U+897f, U+8ca9, U+8cfc, U+904e, U+9664, U+982d, U+9858, U+98a8, U+9a13, U+ff13, U+ff5c; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.112.woff2) format('woff2'); - unicode-range: U+4e16, U+4e3b, U+4ea4, U+4ee4, U+4f4d, U+4f4f, U+4f55, U+4f9b, U+5317, U+5358, U+53c2, U+53e4, U+548c, U+571f, U+59cb, U+5cf6, U+5e38, U+63a2, U+63b2, U+6559, U+662d, U+679c, U+6c7a, U+72b6, U+7523, U+767d, U+770c, U+7a2e, U+7a3f, U+7a7a, U+7b2c, U+7b49, U+7d20, U+7d42, U+8003, U+8272, U+8a08, U+8aac, U+8cb7, U+8eab, U+8ee2, U+9054-9055, U+90fd, U+914d, U+91cd, U+969b, U+97f3, U+984c, U+ff06; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.113.woff2) format('woff2'); - unicode-range: U+26, U+5f, U+2026, U+203b, U+4e09, U+4eac, U+4ed5, U+4fa1, U+5143, U+5199, U+5207, U+539f, U+53e3, U+53f7, U+5411, U+5473, U+5546, U+55b6, U+5929, U+597d, U+5bb9, U+5c11, U+5c4b, U+5ddd, U+5f97, U+5fc5, U+6295, U+6301, U+6307, U+671b, U+76f8, U+78ba, U+795e, U+7d30, U+7d39, U+7d9a, U+89e3, U+8a00, U+8a73, U+8a8d, U+8a9e, U+8aad, U+8abf, U+8cea, U+8eca, U+8ffd, U+904b, U+9650, U+ff11-ff12; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.114.woff2) format('woff2'); - unicode-range: U+3e, U+3005, U+4e0d, U+4e88, U+4ecb, U+4ee3, U+4ef6, U+4fdd, U+4fe1, U+500b, U+50cf, U+5186, U+5316, U+53d7, U+540c, U+544a, U+54e1, U+5728, U+58f2, U+5973, U+5b89, U+5c71, U+5e02, U+5e97, U+5f15, U+5fc3, U+5fdc, U+601d, U+611b, U+611f, U+671f, U+6728, U+6765, U+683c, U+6b21, U+6ce8, U+6d3b, U+6d77, U+7530, U+7740, U+7acb, U+7d50, U+826f, U+8f09, U+8fbc, U+9001, U+9053, U+91ce, U+9762, U+98df; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.115.woff2) format('woff2'); - unicode-range: U+7c, U+3080, U+4ee5, U+5148, U+516c, U+521d, U+5225, U+529b, U+52a0, U+53ef, U+56de, U+56fd, U+5909, U+591a, U+5b66, U+5b9f, U+5bb6, U+5bfe, U+5e73, U+5e83, U+5ea6, U+5f53, U+6027, U+610f, U+6210, U+6240, U+660e, U+66f4, U+66f8, U+6709, U+6771, U+697d, U+69d8, U+6a5f, U+6c34, U+6cbb, U+73fe, U+756a, U+7684, U+771f, U+793a, U+7f8e, U+898f, U+8a2d, U+8a71, U+8fd1, U+9078, U+9577, U+96fb, U+ff5e; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.116.woff2) format('woff2'); - unicode-range: U+a9, U+3010-3011, U+30e2, U+4e0b, U+4eca, U+4ed6, U+4ed8, U+4f53, U+4f5c, U+4f7f, U+53d6, U+540d, U+54c1, U+5730, U+5916, U+5b50, U+5c0f, U+5f8c, U+624b, U+6570, U+6587, U+6599, U+691c, U+696d, U+6cd5, U+7269, U+7279, U+7406, U+767a-767b, U+77e5, U+7d04, U+7d22, U+8005, U+80fd, U+81ea, U+8868, U+8981, U+89a7, U+901a, U+9023, U+90e8, U+91d1, U+9332, U+958b, U+96c6, U+9ad8, U+ff1a, U+ff1f; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.117.woff2) format('woff2'); - unicode-range: U+4e, U+a0, U+3000, U+300c-300d, U+4e00, U+4e0a, U+4e2d, U+4e8b, U+4eba, U+4f1a, U+5165, U+5168, U+5185, U+51fa, U+5206, U+5229, U+524d, U+52d5, U+5408, U+554f, U+5831, U+5834, U+5927, U+5b9a, U+5e74, U+5f0f, U+60c5, U+65b0, U+65b9, U+6642, U+6700, U+672c, U+682a, U+6b63, U+6c17, U+7121, U+751f, U+7528, U+753b, U+76ee, U+793e, U+884c, U+898b, U+8a18, U+9593, U+95a2, U+ff01, U+ff08-ff09; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.118.woff2) format('woff2'); - unicode-range: U+21-22, U+27-2a, U+2c-3b, U+3f, U+41-4d, U+4f-5d, U+61-7b, U+7d, U+ab, U+ae, U+b2-b3, U+b7, U+bb, U+c9, U+cd, U+d6, U+d8, U+dc, U+e0-e5, U+e7-ed, U+ef, U+f1-f4, U+f6, U+f8, U+fa, U+fc-fd, U+103, U+14d, U+1b0, U+300-301, U+1ebf, U+1ec7, U+2013-2014, U+201c-201d, U+2039-203a, U+203c, U+2048-2049, U+2113, U+2122, U+65e5, U+6708, U+70b9; -} -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFow2oe2EcP5pp0erwTqsSWs9Jezazjcb4.119.woff2) format('woff2'); - unicode-range: U+20, U+2027, U+3001-3002, U+3041-307f, U+3081-308f, U+3091-3093, U+3099-309a, U+309d-309e, U+30a1-30e1, U+30e3-30ed, U+30ef-30f0, U+30f2-30f4, U+30fb-30fe, U+ff0c, U+ff0e; -} -/* cyrillic */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYxQgP6lY.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYzggP6lY.woff2) format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYzwgP6lY.woff2) format('woff2'); - unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Noto Sans JP'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(https://fonts.gstatic.com/s/notosansjp/v55/-F62fjtqLzI2JPCgQBnw7HFYwQgP.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} diff --git a/src/main/resources/webui/script.js b/src/main/resources/webui/script.js deleted file mode 100644 index 7c28b1fe..00000000 --- a/src/main/resources/webui/script.js +++ /dev/null @@ -1,59 +0,0 @@ -// 入力した値を Minecraft の Mod に送信する -async function toMC() { - - // HTMLから 画像アドレス を取得 - let address = document.getElementById("address").value; - - // もし URL の長さが 30 より大きい場合 - if (address.length > 30) { - // 短縮URL を取得して address に代入する - address = await getShortURL(address); - } - - //---------- HTMLから値を取得 ---------- start - const width = document.getElementById("width").value; - const height = document.getElementById("height").value; - const x = document.getElementById("x").value; - const y = document.getElementById("y").value; - const z = document.getElementById("z").value; - const rx = document.getElementById("rx").value; - const ry = document.getElementById("ry").value; - const rz = document.getElementById("rz").value; - //---------- HTMLから値を取得 ---------- end - - const reqJson = { - "address": address, - "width": width, - "height": height, - "x": x, - "y": y, - "z": z, - "rx": rx, - "ry": ry, - "rz": rz - } - - // Minecraft に 看板に記述される値を Post で送る - const resJson = await postJson("./write", reqJson); - - // レスポンス Json をコンソールに出力 - console.log(resJson); - - // もし、成功した場合は このWebUIを閉じる - if (resJson.status) window.close(); - // そうでない場合は コンソールに エラーメッセージを送信 - else console.log("The give command was not successful."); -} - -// アップロードする画像ファイルが選択されたら -async function onFile(input) { - // 画像ファイルを取得 - const file = input.files[0]; - // アップロードして画像のURLを取得 - const url = await uploadFile(file); - // 画像アドレスのテキストボックスに画像のURLを入力 - document.getElementById("address").value = url; - - // プレビュー画像を更新する - detectChangeURL(); -} \ No newline at end of file diff --git a/src/main/resources/webui/style.css b/src/main/resources/webui/style.css deleted file mode 100644 index 810e9df5..00000000 --- a/src/main/resources/webui/style.css +++ /dev/null @@ -1,11 +0,0 @@ -@charset "utf-8"; -@import url("sanitize.css"); -@import url('sans.css'); - -body { - font-family: 'Noto Sans JP', 'Noto Sans', sans-serif; - background-color: #f5f5f5; - text-align: center; - padding: 50px; - color: #333; -} \ No newline at end of file diff --git a/src/main/resources/webui/utils.js b/src/main/resources/webui/utils.js deleted file mode 100644 index 6382ee9a..00000000 --- a/src/main/resources/webui/utils.js +++ /dev/null @@ -1,78 +0,0 @@ -// Get リクエスト -// json を return する -function get(url) { - return new Promise((resolve) => { - fetch(url) - .then((res) => res.json()) - .then((json) => resolve(json)) - .catch(() => resolve(undefined)); - }); -} - -// Post リクエスト (Json) -// json を return する -function postJson(url, data) { - return new Promise((resolve) => { - fetch(url, { - method: "POST", - headers: {// JSON形式のデータのヘッダー - 'Content-Type': 'application/json' - }, - body: JSON.stringify(data) - }) - .then((res) => res.json()) - .then((json) => resolve(json)) - .catch(() => resolve(undefined)); - }); -} - -async function getShortURL(url) { - let shorturl = localStorage.getItem(url); - - // ローカルストレージに短縮したURLがキャッシュされていたら - // それを return する - if (shorturl) return shorturl; - - // https://is.gd/ の URL短縮APIを利用して 短縮URLを生成 - json = await get( - `https://is.gd/create.php?format=json&url=${encodeURIComponent(url)}` - ); - // 送られてきた json に shorturl があるかどうか チェック - - // shorturl の値を置き換える - shorturl = json.shorturl; - - if (shorturl) { - //もし あったら - - // ローカルストレージを利用して 短縮したURLをキャッシュ - localStorage.setItem(url, shorturl); - - // ログを送信 - console.log(`URLを短縮しました: ${url} -> ${shorturl}`); - return shorturl; - } else { - //もし なかったら - //エラーのログを送信 - console.error("URLを短縮できませんでした"); - return url; - } -} - -// ファイルをアップロードする関数 -async function uploadFile(file) { - const url = "./upload"; // アップロード先のURL - const json = { file: await toBase64(file), name: file.name }; - const resJson = await postJson(url, json); - if (resJson == undefined || !resJson.status) return "アップロードに失敗しました" - return resJson.result; -} - -// base64 変換 -function toBase64(file) { - const reader = new FileReader(); - return new Promise((resolve) => { - reader.onload = (e) => resolve(e.target.result); - reader.readAsDataURL(file); - }); -} \ No newline at end of file diff --git a/targets.json b/targets.json new file mode 100644 index 00000000..7cbc8de2 --- /dev/null +++ b/targets.json @@ -0,0 +1,69 @@ +{ + "eras": { + "v1_7": {"sources": {"main": ["legacy/main", "v1_7/main", "item_legacy17/main"], "forge": ["v1_7/forge", "item_legacy17/forge"], "liteloader": ["legacy/liteloader", "item_legacy17/liteloader"]}}, + "v1_8_0": {"sources": {"main": ["legacy/main", "v1_8_0/main", "item_mesher/main"], "forge": ["legacy/forge"], "liteloader": ["legacy/liteloader"]}}, + "v1_8": {"sources": {"main": ["legacy/main", "v1_8/main", "item_mesher/main"], "forge": ["legacy/forge"], "liteloader": ["legacy/liteloader"]}}, + "v1_9": {"sources": {"main": ["legacy/main", "v1_9/main", "item_render/main"], "forge": ["legacy/forge"], "liteloader": ["legacy/liteloader"]}}, + "v1_10": {"sources": {"main": ["legacy/main", "v1_10/main", "item_render/main"], "forge": ["legacy/forge"], "liteloader": ["legacy/liteloader"]}}, + "v1_11": {"sources": {"main": ["legacy/main", "v1_11/main", "item_render/main"], "forge": ["legacy/forge"], "liteloader": ["legacy/liteloader"]}}, + "v1_12": {"sources": {"main": ["legacy/main", "v1_12/main", "item_render/main"], "forge": ["legacy/forge"], "liteloader": ["legacy/liteloader"]}}, + "v1_14": {"sources": {"main": ["modern/main", "classic/main", "ber14/main", "tex_0/main", "v1_14/main", "item_static_1/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_15": {"sources": {"main": ["modern/main", "classic/main", "ber16/main", "tex_1r/main", "v1_15/main", "item_static_2/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_16": {"sources": {"main": ["modern/main", "classic/main", "ber16/main", "tex_1/main", "v1_16/main", "item_static_3/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_17": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_1/main", "v1_17/main", "item_bewlr_1/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_19": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_1/main", "v1_19/main", "item_bewlr_1/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_19_3": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_1/main", "v1_19_3/main", "item_bewlr_1/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_19_4": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_1/main", "v1_19_3/main", "item_bewlr_2/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_20": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_1/main", "v1_20/main", "item_bewlr_2/main", "item_nbt/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_20_5": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_1/main", "v1_20/main", "item_bewlr_2/main", "item_components/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_2/main", "v1_21/main", "item_bewlr_2/main", "item_components/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21_2": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_3/main", "v1_21_2/main", "item_bewlr_3/main", "item_components/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21_4": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_3/main", "v1_21_2/main", "item_model_1/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21_5": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_4/main", "v1_21_5/main", "item_model_2/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21_6": {"sources": {"main": ["modern/main", "classic/main", "classic_ber/main", "tex_4/main", "v1_21_6/main", "item_model_3/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21_9": {"sources": {"main": ["modern/main", "renderstate/main", "tex_4/main", "v1_21_9/main", "board_none/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v1_21_11": {"sources": {"main": ["modern/main", "renderstate/main", "tex_5/main", "v1_21_9/main", "board_none/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v26_1": {"sources": {"main": ["modern/main", "renderstate/main", "tex_5/main", "v26/main", "v26_1/main", "board_none/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v26_2": {"sources": {"main": ["modern/main", "renderstate/main", "tex_5/main", "v26/main", "v26_2/main", "board_model/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}}, + "v26_3": {"sources": {"main": ["modern/main", "renderstate/main", "tex_5/main", "v26/main", "v26_3/main", "board_model/main"], "fabric": ["common/fabric"], "forge": ["common/forge"], "neoforge": ["common/neoforge"]}} + }, + "targets": [ + {"name": "mc1_7_10", "era": "v1_7", "minecraft": "1.7.10", "mappings": "mcp:stable:12-1.7.10", "loaders": {"forge": {"loader": "10.13.4.1614-1.7.10", "versions": ["1.7.10"]}, "liteloader": {"loader": "1.7.10_04"}}}, + {"name": "mc1_8", "era": "v1_8_0", "minecraft": "1.8", "mappings": "mcp:stable:18-1.8", "loaders": {"forge": {"loader": "11.14.4.1577", "versions": ["1.8"]}, "liteloader": {"loader": "1.8"}}}, + {"name": "mc1_8_8", "era": "v1_8", "minecraft": "1.8.8", "mappings": "mcp:stable:20-1.8.8", "loaders": {"forge": {"loader": "11.15.0.1655", "versions": ["1.8.8"]}}}, + {"name": "mc1_8_9", "era": "v1_8", "minecraft": "1.8.9", "mappings": "mcp:stable:22-1.8.9", "loaders": {"forge": {"loader": "11.15.1.2318-1.8.9", "versions": ["1.8.9"]}, "liteloader": {"loader": "1.8.9-SNAPSHOT"}}}, + {"name": "mc1_9", "era": "v1_9", "minecraft": "1.9", "mappings": "mcp:stable:24-1.9", "loaders": {"forge": {"loader": "12.16.1.1938-1.9.0", "versions": ["1.9"]}, "liteloader": {"loader": "1.9-SNAPSHOT"}}}, + {"name": "mc1_9_4", "era": "v1_9", "minecraft": "1.9.4", "mappings": "mcp:stable:26-1.9.4", "loaders": {"forge": {"loader": "12.17.0.2317-1.9.4", "versions": ["1.9.4"]}, "liteloader": {"loader": "1.9.4-SNAPSHOT"}}}, + {"name": "mc1_10", "era": "v1_10", "minecraft": "1.10", "mappings": "mcp:stable:29-1.10.2", "loaders": {"forge": {"loader": "12.18.0.2000-1.10.0", "versions": ["1.10"]}, "liteloader": {"loader": "1.10-SNAPSHOT"}}}, + {"name": "mc1_10_2", "era": "v1_10", "minecraft": "1.10.2", "mappings": "mcp:stable:29-1.10.2", "loaders": {"forge": {"loader": "12.18.3.2511", "versions": ["1.10.2"]}, "liteloader": {"loader": "1.10.2-SNAPSHOT"}}}, + {"name": "mc1_11", "era": "v1_11", "minecraft": "1.11", "mappings": "mcp:stable:32-1.11", "loaders": {"forge": {"loader": "13.19.1.2199", "versions": ["1.11"]}, "liteloader": {"loader": "1.11-SNAPSHOT"}}}, + {"name": "mc1_11_2", "era": "v1_11", "minecraft": "1.11.2", "mappings": "mcp:stable:32-1.11", "loaders": {"forge": {"loader": "13.20.1.2588", "versions": ["1.11.2"]}, "liteloader": {"loader": "1.11.2-SNAPSHOT"}}}, + {"name": "mc1_12", "era": "v1_12", "minecraft": "1.12", "mappings": "mcp:stable:39-1.12", "loaders": {"forge": {"loader": "14.21.1.2443", "versions": ["1.12"]}, "liteloader": {"loader": "1.12-SNAPSHOT"}}}, + {"name": "mc1_12_1", "era": "v1_12", "minecraft": "1.12.1", "mappings": "mcp:stable:39-1.12", "loaders": {"forge": {"loader": "14.22.1.2485", "versions": ["1.12.1"]}, "liteloader": {"loader": "1.12.1-SNAPSHOT"}}}, + {"name": "mc1_12_2", "era": "v1_12", "minecraft": "1.12.2", "mappings": "mcp:stable:39-1.12", "loaders": {"forge": {"loader": "14.23.5.2860", "versions": ["1.12.2"]}, "liteloader": {"loader": "1.12.2-SNAPSHOT"}}}, + {"name": "mc1_14_4", "era": "v1_14", "minecraft": "1.14.4", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.14", "1.14.1", "1.14.2", "1.14.3", "1.14.4"]}, "forge": {"loader": "28.2.26", "versions": ["1.14.2", "1.14.3", "1.14.4"], "launch": {"1.14.2": "26.0.63", "1.14.3": "27.0.60", "1.14.4": "28.2.26"}}}}, + {"name": "mc1_15_2", "era": "v1_15", "minecraft": "1.15.2", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.15", "1.15.1", "1.15.2"]}, "forge": {"loader": "31.2.57", "versions": ["1.15", "1.15.1", "1.15.2"], "launch": {"1.15": "29.0.4", "1.15.1": "30.0.51", "1.15.2": "31.2.57"}}}}, + {"name": "mc1_16_1", "era": "v1_16", "minecraft": "1.16.1", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.16", "1.16.1"]}, "forge": {"loader": "32.0.108", "versions": ["1.16.1"], "launch": {"1.16.1": "32.0.108"}, "stubs": [["net/minecraft/client/gui/widget/Widget", "func_238483_d_;()I", "getHeightRealms"]]}}}, + {"name": "mc1_16_5", "era": "v1_16", "minecraft": "1.16.5", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.16.2", "1.16.3", "1.16.4", "1.16.5"]}, "forge": {"loader": "36.2.42", "versions": ["1.16.2", "1.16.3", "1.16.4", "1.16.5"], "launch": {"1.16.2": "33.0.61", "1.16.3": "34.1.42", "1.16.4": "35.1.37", "1.16.5": "36.2.42"}}}}, + {"name": "mc1_17_1", "era": "v1_17", "minecraft": "1.17.1", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.17", "1.17.1"]}, "forge": {"loader": "37.1.1", "versions": ["1.17.1"], "launch": {"1.17.1": "37.1.1"}}}}, + {"name": "mc1_18_2", "era": "v1_17", "minecraft": "1.18.2", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.18", "1.18.1", "1.18.2"]}, "forge": {"loader": "40.3.12", "versions": ["1.18", "1.18.1", "1.18.2"], "launch": {"1.18": "38.0.17", "1.18.1": "39.1.2", "1.18.2": "40.3.12"}}}}, + {"name": "mc1_19_2", "era": "v1_19", "minecraft": "1.19.2", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.19", "1.19.1", "1.19.2"]}, "forge": {"loader": "43.5.2", "versions": ["1.19", "1.19.1", "1.19.2"], "launch": {"1.19": "41.1.0", "1.19.1": "42.0.9", "1.19.2": "43.5.2"}}}}, + {"name": "mc1_19_3", "era": "v1_19_3", "minecraft": "1.19.3", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.19.3"]}, "forge": {"loader": "44.1.23", "versions": ["1.19.3"], "launch": {"1.19.3": "44.1.23"}}}}, + {"name": "mc1_19_4", "era": "v1_19_4", "minecraft": "1.19.4", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.19.4"]}, "forge": {"loader": "45.4.5", "versions": ["1.19.4"], "launch": {"1.19.4": "45.4.5"}}}}, + {"name": "mc1_20_1", "era": "v1_20", "minecraft": "1.20.1", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.20", "1.20.1"]}, "forge": {"loader": "47.4.26", "versions": ["1.20", "1.20.1"], "launch": {"1.20": "46.0.14", "1.20.1": "47.4.26"}, "neoforge_launch": {"1.20.1": "1.20.1-47.1.106"}}}}, + {"name": "mc1_20_4", "era": "v1_20", "minecraft": "1.20.4", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.20.2", "1.20.3", "1.20.4"]}, "forge": {"loader": "49.2.11", "versions": ["1.20.2", "1.20.3", "1.20.4"], "launch": {"1.20.2": "48.1.0", "1.20.3": "49.0.2", "1.20.4": "49.2.11"}}, "neoforge": {"loader": "251", "versions": ["1.20.2", "1.20.3", "1.20.4"], "launch": {"1.20.2": "20.2.93", "1.20.3": "20.3.8-beta", "1.20.4": "20.4.251"}}}}, + {"name": "mc1_20_6", "era": "v1_20_5", "minecraft": "1.20.6", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.20.5", "1.20.6"]}, "forge": {"loader": "50.2.12", "versions": ["1.20.6"], "launch": {"1.20.6": "50.2.12"}}, "neoforge": {"loader": "141", "versions": ["1.20.5", "1.20.6"], "launch": {"1.20.5": "20.5.21-beta", "1.20.6": "20.6.141"}}}}, + {"name": "mc1_21_1", "era": "v1_21", "minecraft": "1.21.1", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21", "1.21.1"]}, "forge": {"loader": "52.1.18", "versions": ["1.21", "1.21.1"], "launch": {"1.21": "51.0.33", "1.21.1": "52.1.18"}}, "neoforge": {"loader": "259", "versions": ["1.21", "1.21.1"], "launch": {"1.21": "21.0.167", "1.21.1": "21.1.259"}}}}, + {"name": "mc1_21_3", "era": "v1_21_2", "minecraft": "1.21.3", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21.2", "1.21.3"]}, "forge": {"loader": "53.1.14", "versions": ["1.21.3"], "launch": {"1.21.3": "53.1.14"}}, "neoforge": {"loader": "97", "versions": ["1.21.2", "1.21.3"], "launch": {"1.21.2": "21.2.1-beta", "1.21.3": "21.3.97"}}}}, + {"name": "mc1_21_4", "era": "v1_21_4", "minecraft": "1.21.4", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21.4"]}, "forge": {"loader": "54.1.20", "versions": ["1.21.4"], "launch": {"1.21.4": "54.1.20"}}, "neoforge": {"loader": "158", "versions": ["1.21.4"], "launch": {"1.21.4": "21.4.158"}}}}, + {"name": "mc1_21_5", "era": "v1_21_5", "minecraft": "1.21.5", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21.5"]}, "forge": {"loader": "55.1.16", "versions": ["1.21.5"], "launch": {"1.21.5": "55.1.16"}}, "neoforge": {"loader": "98", "versions": ["1.21.5"], "launch": {"1.21.5": "21.5.98"}}}}, + {"name": "mc1_21_8", "era": "v1_21_6", "minecraft": "1.21.8", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21.6", "1.21.7", "1.21.8"]}, "forge": {"loader": "58.1.24", "versions": ["1.21.6", "1.21.7", "1.21.8"], "launch": {"1.21.6": "56.0.9", "1.21.7": "57.0.3", "1.21.8": "58.1.24"}}, "neoforge": {"loader": "54", "versions": ["1.21.6", "1.21.7", "1.21.8"], "launch": {"1.21.6": "21.6.20-beta", "1.21.7": "21.7.25-beta", "1.21.8": "21.8.54"}}}}, + {"name": "mc1_21_10", "era": "v1_21_9", "minecraft": "1.21.10", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21.9", "1.21.10"]}, "forge": {"loader": "60.1.17", "versions": ["1.21.9", "1.21.10"], "launch": {"1.21.9": "59.0.5", "1.21.10": "60.1.17"}}, "neoforge": {"loader": "64", "versions": ["1.21.9", "1.21.10"], "launch": {"1.21.9": "21.9.16-beta", "1.21.10": "21.10.64"}}}}, + {"name": "mc1_21_11", "era": "v1_21_11", "minecraft": "1.21.11", "mappings": "mojmap", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["1.21.11"]}, "forge": {"loader": "61.2.3", "versions": ["1.21.11"], "launch": {"1.21.11": "61.2.3"}}, "neoforge": {"loader": "45", "versions": ["1.21.11"], "launch": {"1.21.11": "21.11.45"}}}}, + {"name": "mc26_1", "era": "v26_1", "minecraft": "26.1", "mappings": "none", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["26.1"]}, "forge": {"loader": "62.0.9", "versions": ["26.1"], "launch": {"26.1": "62.0.9"}}, "neoforge": {"loader": "19-beta", "versions": ["26.1"], "launch": {"26.1": "26.1.0.19-beta"}}}}, + {"name": "mc26_1_1", "era": "v26_1", "minecraft": "26.1.1", "mappings": "none", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["26.1.1"]}, "forge": {"loader": "63.0.2", "versions": ["26.1.1"], "launch": {"26.1.1": "63.0.2"}}, "neoforge": {"loader": "15-beta", "versions": ["26.1.1"], "launch": {"26.1.1": "26.1.1.15-beta"}}}}, + {"name": "mc26_1_2", "era": "v26_1", "minecraft": "26.1.2", "mappings": "none", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["26.1.2"]}, "forge": {"loader": "64.1.4", "versions": ["26.1.2"], "launch": {"26.1.2": "64.1.4"}}, "neoforge": {"loader": "116", "versions": ["26.1.2"], "launch": {"26.1.2": "26.1.2.116"}}}}, + {"name": "mc26_2", "era": "v26_2", "minecraft": "26.2", "mappings": "none", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["26.2"]}, "forge": {"loader": "65.1.4", "versions": ["26.2"], "launch": {"26.2": "65.1.4"}}, "neoforge": {"loader": "90", "versions": ["26.2"], "launch": {"26.2": "26.2.0.90"}}}}, + {"name": "mc26_3", "era": "v26_3", "minecraft": "26.3", "mappings": "none", "loaders": {"fabric": {"loader": "0.19.5", "versions": ["26.3"]}, "forge": {"loader": "66.0.11", "versions": ["26.3"], "launch": {"26.3": "66.0.11"}}, "neoforge": {"loader": "76", "versions": ["26.3"], "launch": {"26.3": "26.3.0.76"}}}} + ] +} diff --git a/tools/check_linkage.py b/tools/check_linkage.py new file mode 100644 index 00000000..0350c796 --- /dev/null +++ b/tools/check_linkage.py @@ -0,0 +1,540 @@ +"""配布する jar が、対応しているすべての Minecraft のバージョンで正しくつながるかを、起動せずに確かめる。 + + python tools/check_linkage.py [--jar dist/build/libs/MarumaSign-x.y.z.jar] [--only fabric:1.15 ...] + +1 つのビルド対象 (例: 1.15.2 向け) を、近いバージョン (1.15 や 1.15.1) でも使っている。 +近いバージョンでも名前は同じだが、引数や戻り値の型が違うメソッドがあると、そこを通ったときに初めて落ちる。 +そこで、jar の中の各バージョン向けのクラスが参照している Minecraft のクラス・メソッド・フィールドを取り出し、 +「ビルドしたバージョンにはあるのに、実際に使われるバージョンにはない」ものを探す。 +オーバーライドしているメソッドが、そのバージョンでは別の形になっていないかも確かめる。 + +Minecraft 本体は、実行時と同じ名前で調べる。 + +- Fabric (26.1 より前): 中間名。Mojang の配布する本体に、Fabric の対応表を当てる +- Forge 1.20.4 以前 / NeoForge 1.20.1: SRG 名。Forge のインストールでできた jar を使う + (実機での確認ツールが一度インストールしたものが必要。まだないバージョンは飛ばして、最後に一覧を出す) +- Forge 1.20.6 以降 / NeoForge 1.20.2 以降: 公式の名前。Mojang の配布する本体に、公式の対応表を当てる +- 26.1 以降: 本体が最初から公式の名前なので、そのまま使う +""" + +import argparse +import io +import json +import pickle +import re +import struct +import sys +import urllib.request +import zipfile +from pathlib import Path + +REPO = Path(__file__).resolve().parents[1] +ROOT = Path.home() / ".marumasign-verify" +CACHE = ROOT / "linkage" +MANIFEST = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" +INTERMEDIARY = "https://maven.fabricmc.net/net/fabricmc/intermediary/{0}/intermediary-{0}-v2.jar" +USER_AGENT = "MarumaSign-verify/1.0 (local testing)" +PACKAGE = "marumasa/marumasa_sign/" + +ACC_PRIVATE, ACC_STATIC, ACC_ABSTRACT = 0x0002, 0x0008, 0x0400 +OBJECT_METHODS = {"hashCode", "equals", "toString", "getClass", "clone", "finalize", "notify", "notifyAll", "wait"} + + +def version_key(version): + return tuple(int(part) for part in re.findall(r"\d+", version)) + + +def fetch(url): + request = urllib.request.Request(url, headers={"User-Agent": USER_AGENT}) + with urllib.request.urlopen(request, timeout=300) as response: + return response.read() + + +def cached(path, url): + if not path.is_file(): + path.parent.mkdir(parents=True, exist_ok=True) + temporary = path.with_suffix(path.suffix + ".part") + temporary.write_bytes(fetch(url)) + temporary.replace(path) + return path + + +# ---------- クラスファイル ---------- + +class ClassInfo: + __slots__ = ("name", "parent", "interfaces", "access", "fields", "methods", "references", "classes") + + def __init__(self): + self.fields = {} # (名前, 型) -> アクセスフラグ + self.methods = {} # (名前, 型) -> アクセスフラグ + self.references = [] # (種類, 持ち主, 名前, 型) + self.classes = set() # 参照しているクラス + + +def parse_class(data, with_references=False): + count = struct.unpack_from(">H", data, 8)[0] + pool = [None] * count + position = 10 + index = 1 + while index < count: + tag = data[position] + if tag == 1: + length = struct.unpack_from(">H", data, position + 1)[0] + pool[index] = data[position + 3:position + 3 + length].decode("utf-8", "replace") + position += 3 + length + elif tag in (3, 4): + position += 5 + elif tag in (5, 6): + position += 9 + index += 1 + elif tag in (7, 8, 16, 19, 20): + pool[index] = (tag, struct.unpack_from(">H", data, position + 1)[0]) + position += 3 + elif tag in (9, 10, 11, 12, 17, 18): + pool[index] = (tag,) + struct.unpack_from(">HH", data, position + 1) + position += 5 + elif tag == 15: + position += 4 + else: + raise ValueError(f"unknown constant tag {tag}") + index += 1 + + def class_name(number): + return pool[pool[number][1]] if number else None + + info = ClassInfo() + info.access, this_class, super_class, interface_count = struct.unpack_from(">HHHH", data, position) + position += 8 + info.name = class_name(this_class) + info.parent = class_name(super_class) + info.interfaces = [class_name(number) for number in struct.unpack_from(f">{interface_count}H", data, position)] + position += 2 * interface_count + for members in (info.fields, info.methods): + member_count = struct.unpack_from(">H", data, position)[0] + position += 2 + for _ in range(member_count): + access, name, descriptor, attribute_count = struct.unpack_from(">HHHH", data, position) + position += 8 + for _ in range(attribute_count): + position += 6 + struct.unpack_from(">I", data, position + 2)[0] + members[(pool[name], pool[descriptor])] = access + if with_references: + for entry in pool: + if not isinstance(entry, tuple): + continue + if entry[0] == 7: + name = pool[entry[1]] + while name.startswith("["): + name = name[1:] + if name.startswith("L") and name.endswith(";"): + name = name[1:-1] + if len(name) > 1: + info.classes.add(name) + elif entry[0] in (9, 10, 11): + owner = pool[pool[entry[1]][1]] + name_and_type = pool[entry[2]] + if not owner.startswith("["): + info.references.append(("field" if entry[0] == 9 else "method", owner, + pool[name_and_type[1]], pool[name_and_type[2]])) + return info + + +def read_classes(jar_bytes_or_path, prefix="", with_references=False): + classes = {} + with zipfile.ZipFile(jar_bytes_or_path) as archive: + for name in archive.namelist(): + if name.endswith(".class") and name.startswith(prefix) and not name.startswith("META-INF/"): + try: + info = parse_class(archive.read(name), with_references) + except (ValueError, struct.error, IndexError): + continue + classes[info.name] = info + return classes + + +# ---------- Minecraft 本体を、実行時の名前で見たもの ---------- + +def map_descriptor(descriptor, class_map): + return re.sub(r"L([^;]+);", lambda match: "L" + class_map.get(match.group(1), match.group(1)) + ";", descriptor) + + +def remap_view(classes, class_map, method_map, field_map): + """難読化された名前のクラスの一覧を、対応表で実行時の名前に直す。""" + + def method_name(owner, name, descriptor, seen): + # 親から受け継いだメソッドは、親の側にだけ対応が書かれていることがある + if owner in seen or owner not in classes: + return None + seen.add(owner) + mapped = method_map.get((owner, name, descriptor)) + if mapped is not None: + return mapped + info = classes[owner] + for parent in [info.parent] + info.interfaces: + if parent: + mapped = method_name(parent, name, descriptor, seen) + if mapped is not None: + return mapped + return None + + view = {} + for obfuscated, info in classes.items(): + mapped = ClassInfo() + mapped.name = class_map.get(obfuscated, obfuscated) + mapped.access = info.access + mapped.parent = class_map.get(info.parent, info.parent) if info.parent else None + mapped.interfaces = [class_map.get(name, name) for name in info.interfaces] + for (name, descriptor), access in info.methods.items(): + new_name = name if name.startswith("<") else (method_name(obfuscated, name, descriptor, set()) or name) + mapped.methods[(new_name, map_descriptor(descriptor, class_map))] = access + for (name, descriptor), access in info.fields.items(): + new_name = field_map.get((obfuscated, name, descriptor)) or field_map.get((obfuscated, name)) or name + mapped.fields[(new_name, map_descriptor(descriptor, class_map))] = access + view[mapped.name] = mapped + return view + + +def version_json(minecraft): + path = CACHE / minecraft / "version.json" + if not path.is_file(): + manifest = json.loads(cached(CACHE / "manifest.json", MANIFEST).read_bytes()) + entry = next((item for item in manifest["versions"] if item["id"] == minecraft), None) + if entry is None: + # 一覧が古い + (CACHE / "manifest.json").unlink() + manifest = json.loads(cached(CACHE / "manifest.json", MANIFEST).read_bytes()) + entry = next(item for item in manifest["versions"] if item["id"] == minecraft) + cached(path, entry["url"]) + return json.loads(path.read_bytes()) + + +def client_jar(minecraft): + return cached(CACHE / minecraft / "client.jar", version_json(minecraft)["downloads"]["client"]["url"]) + + +def intermediary_view(minecraft): + classes = read_classes(client_jar(minecraft)) + jar = cached(CACHE / minecraft / "intermediary.jar", INTERMEDIARY.format(minecraft)) + with zipfile.ZipFile(jar) as archive: + lines = archive.read("mappings/mappings.tiny").decode("utf-8").splitlines() + class_map, method_map, field_map = {}, {}, {} + owner = None + for line in lines[1:]: + parts = line.split("\t") + if parts[0] == "c": + owner = parts[1] + class_map[owner] = parts[2] + elif parts[0] == "" and len(parts) >= 5 and parts[1] == "m": + method_map[(owner, parts[3], parts[2])] = parts[4] + elif parts[0] == "" and len(parts) >= 5 and parts[1] == "f": + field_map[(owner, parts[3], parts[2])] = parts[4] + return remap_view(classes, class_map, method_map, field_map) + + +PRIMITIVES = {"void": "V", "boolean": "Z", "byte": "B", "char": "C", "short": "S", "int": "I", "long": "J", + "float": "F", "double": "D"} + + +def java_type(name, to_obfuscated): + dimensions = name.count("[]") + name = name.replace("[]", "") + if name in PRIMITIVES: + base = PRIMITIVES[name] + else: + internal = name.replace(".", "/") + base = "L" + to_obfuscated.get(internal, internal) + ";" + return "[" * dimensions + base + + +def official_maps(minecraft): + """公式の対応表。(クラス, メソッド, フィールド) の、難読化された名前から公式の名前への対応。なければ None。""" + downloads = version_json(minecraft)["downloads"] + if "client_mappings" not in downloads: + return None + text = cached(CACHE / minecraft / "client.txt", downloads["client_mappings"]["url"]).read_text(encoding="utf-8") + to_obfuscated = {} + for line in text.splitlines(): + if line and not line.startswith((" ", "#")): + named, obfuscated = line.rstrip(":").split(" -> ") + to_obfuscated[named.replace(".", "/")] = obfuscated.replace(".", "/") + class_map = {obfuscated: named for named, obfuscated in to_obfuscated.items()} + method_map, field_map = {}, {} + owner = None + for line in text.splitlines(): + if not line or line.startswith("#"): + continue + if not line.startswith(" "): + owner = to_obfuscated[line.split(" -> ")[0].replace(".", "/")] + continue + left, obfuscated = line.strip().split(" -> ") + kind, signature = left.rsplit(" ", 1) + kind = kind.split(":")[-1] + if "(" in signature: + name, arguments = signature.rstrip(")").split("(") + descriptor = "(" + "".join(java_type(item, to_obfuscated) for item in arguments.split(",") if item) + ")" \ + + java_type(kind, to_obfuscated) + method_map[(owner, obfuscated, descriptor)] = name + else: + field_map[(owner, obfuscated, java_type(kind, to_obfuscated))] = signature + return class_map, method_map, field_map + + +def official_view(minecraft): + classes = read_classes(client_jar(minecraft)) + maps = official_maps(minecraft) + # 対応表がないのは、本体が最初から公式の名前になっているバージョン + return classes if maps is None else remap_view(classes, *maps) + + +MCP_CONFIG = "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_config/" + + +def srg_view(minecraft, installed=False): + """SRG 名の本体。Forge の対応表から組み立てる。 + + installed が True なら、Forge のインストールでできた jar をそのまま読む (組み立てた結果の確認用)。 + """ + if installed: + base = ROOT / "main" / "libraries" / "net" / "minecraft" / "client" + jars = sorted(base.glob(f"{minecraft}-*/client-{minecraft}-*-srg.jar")) + return read_classes(jars[-1]) if jars else None + metadata = cached(CACHE / "mcp_config.xml", MCP_CONFIG + "maven-metadata.xml").read_text(encoding="utf-8") + versions = [item for item in re.findall(r"([^<]+)", metadata) + if item == minecraft or item.startswith(minecraft + "-")] + lines = None + for version in reversed(versions): + # 新しい版には、SRG 名ではなく公式の名前が入っているものがある。SRG 名が入っている最も新しい版を使う + archive_path = cached(CACHE / minecraft / f"mcp_config-{version}.zip", + f"{MCP_CONFIG}{version}/mcp_config-{version}.zip") + with zipfile.ZipFile(archive_path) as archive: + candidate = archive.read("config/joined.tsrg").decode("utf-8") + if re.search(r" (func_\d+_\w+|m_\d+_)\s", candidate): + lines = candidate.splitlines() + break + if lines is None: + return None + class_map, method_map, field_map = {}, {}, {} + owner = None + for line in lines: + if line.startswith("tsrg2") or line.startswith("\t\t") or not line.strip(): + continue + parts = line.strip().split(" ") + if not line.startswith("\t"): + owner = parts[0] + class_map[owner] = parts[1] + elif parts[1].startswith("("): + method_map[(owner, parts[0], parts[1])] = parts[2] + else: + field_map[(owner, parts[0])] = parts[1] + if version_key(minecraft) >= (1, 17): + # 1.17 以降は、クラスの名前だけ公式のものを使う + class_map = official_maps(minecraft)[0] + return remap_view(read_classes(client_jar(minecraft)), class_map, method_map, field_map) + + +def runtime_names(loader, minecraft): + key = version_key(minecraft) + if key >= (26, 1): + return "official" + if loader == "fabric": + return "intermediary" + if loader == "forge": + if key < (1, 13): + # 1.12.2 以前は、バージョンごとに専用のビルドがあるので、突き合わせる相手がない + return None + return "srg" if key <= (1, 20, 4) else "official" + if loader == "neoforge": + return "srg" if key <= (1, 20, 1) else "official" + return None + + +VIEWS = {} + + +def view_of(loader, minecraft): + names = runtime_names(loader, minecraft) + if names is None: + return None + key = (names, minecraft) + if key not in VIEWS: + path = CACHE / minecraft / f"view-{names}.pickle" + if path.is_file(): + VIEWS[key] = pickle.loads(path.read_bytes()) + else: + view = {"intermediary": intermediary_view, "official": official_view, "srg": srg_view}[names](minecraft) + if view is not None: + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(pickle.dumps(view)) + VIEWS[key] = view + return VIEWS[key] + + +# ---------- 突き合わせ ---------- + +def find_member(view, owner, kind, name, descriptor, extra=None): + """メンバーが見つかれば True、ないと言い切れれば False、本体の外のクラスにたどり着いたら None。""" + pending, seen, unknown = [owner], set(), False + while pending: + current = pending.pop() + if current in seen or current is None: + continue + seen.add(current) + info = view.get(current) or (extra or {}).get(current) + if info is None: + if current == "java/lang/Object": + if kind == "method" and name in OBJECT_METHODS: + return True + else: + unknown = True + continue + if (name, descriptor) in (info.methods if kind == "method" else info.fields): + return True + pending += [info.parent] + info.interfaces + return None if unknown else False + + +def minecraft_ancestors(view, own, name): + """自分のクラスの親をたどって、Minecraft 本体のクラスに行き着いたものを返す。""" + found, pending, seen = [], [name], set() + while pending: + current = pending.pop() + if current in seen or current is None: + continue + seen.add(current) + if current in own: + pending += [own[current].parent] + own[current].interfaces + elif current in view: + found.append(current) + return found + + +def check(own, reference, actual): + """own: 自分のクラス。reference: ビルドしたバージョンの本体。actual: 実際に使われるバージョンの本体。""" + problems = set() + for info in own.values(): + for name in info.classes: + if name in reference and name not in actual: + problems.add(f"class {name} is missing (used by {info.name.rsplit('/', 1)[-1]})") + for kind, owner, name, descriptor in info.references: + if owner in own or owner not in reference: + # 自分のクラス経由の参照は、下の親クラスの確認で見る + if owner not in own: + continue + ancestors = minecraft_ancestors(reference, own, owner) + if not any(find_member(reference, parent, kind, name, descriptor) for parent in ancestors): + continue + if any(find_member(actual, parent, kind, name, descriptor) for parent in ancestors): + continue + problems.add(f"{kind} {owner.rsplit('/', 1)[-1]}.{name} {descriptor} (inherited) is missing" + f" (used by {info.name.rsplit('/', 1)[-1]})") + continue + if find_member(reference, owner, kind, name, descriptor) is not True: + continue + if owner not in actual: + problems.add(f"class {owner} is missing (used by {info.name.rsplit('/', 1)[-1]})") + elif find_member(actual, owner, kind, name, descriptor) is not True: + problems.add(f"{kind} {owner}.{name} {descriptor} is missing (used by {info.name.rsplit('/', 1)[-1]})") + # オーバーライドしているメソッドが、そのバージョンでも同じ形であること + ancestors = minecraft_ancestors(reference, own, info.name) + for (name, descriptor), access in info.methods.items(): + if name.startswith("<") or access & (ACC_PRIVATE | ACC_STATIC): + continue + overrides = [parent for parent in ancestors if find_member(reference, parent, "method", name, descriptor)] + if overrides and not any(find_member(actual, parent, "method", name, descriptor) is not False + for parent in overrides): + problems.add(f"override {info.name.rsplit('/', 1)[-1]}.{name} {descriptor} does not match" + f" any method of {overrides[0]}") + # そのバージョンで実装が必要なメソッドが、欠けていないこと + if not info.access & ACC_ABSTRACT and ancestors: + for missing in unimplemented(own, actual, info.name): + if missing not in unimplemented(own, reference, info.name): + problems.add(f"abstract method {missing[0]} {missing[1]} is not implemented" + f" by {info.name.rsplit('/', 1)[-1]}") + return sorted(problems) + + +def unimplemented(own, view, name): + """クラスが実装していない抽象メソッド。本体の外のクラスが絡むところは調べない。""" + abstract, concrete, pending, seen = set(), set(), [name], set() + while pending: + current = pending.pop() + if current in seen or current is None: + continue + seen.add(current) + info = own.get(current) or view.get(current) + if info is None: + continue + for key, access in info.methods.items(): + if access & ACC_ABSTRACT: + abstract.add(key) + elif not access & (ACC_PRIVATE | ACC_STATIC): + concrete.add(key) + pending += [info.parent] + info.interfaces + return abstract - concrete + + +def main(): + parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) + parser.add_argument("--jar", default=None) + parser.add_argument("--only", nargs="*", default=[], help="loader:version の形式で対象を絞る") + args = parser.parse_args() + + jar = Path(args.jar) if args.jar else next( + path for path in sorted((REPO / "dist" / "build" / "libs").glob("MarumaSign-*.jar"))) + targets = json.loads((REPO / "targets.json").read_text(encoding="utf-8"))["targets"] + built_for = {target["name"]: target["minecraft"] for target in targets} + jar_bytes = jar.read_bytes() + with zipfile.ZipFile(jar) as archive: + table = archive.read("marumasa_sign/targets.properties").decode("utf-8") + nested = {name: archive.read(name) for name in archive.namelist() + if name.startswith("META-INF/jars/") and name.endswith(".jar")} + + # (ローダー, バージョン, ビルド対象)。Forge と NeoForge は jar の中の対応表から、 + # Fabric はバージョンごとに入れ子の jar になっているので、ビルド対象の一覧から求める + combinations = [] + for line in table.splitlines(): + if "=" in line and not line.startswith("#"): + key, target = line.strip().split("=") + loader, minecraft = key.split(".", 1) + combinations.append((loader, minecraft, target)) + for target in targets: + for minecraft in target["loaders"].get("fabric", {}).get("versions", []): + combinations.append(("fabric", minecraft, target["name"])) + + failed, skipped, checked = 0, [], 0 + own_cache = {} + for loader, minecraft, target in sorted(combinations, key=lambda item: (item[0], version_key(item[1]))): + if args.only and f"{loader}:{minecraft}" not in args.only: + continue + if runtime_names(loader, minecraft) is None: + continue + reference = view_of(loader, built_for[target]) + actual = view_of(loader, minecraft) + if reference is None or actual is None: + skipped.append(f"{loader}:{minecraft}" + ("" if actual is None else f" (no {built_for[target]})")) + continue + if (loader, target) not in own_cache: + if loader == "fabric": + data = nested.get(f"META-INF/jars/marumasa_sign-fabric-{target}.jar") + own_cache[(loader, target)] = read_classes(io.BytesIO(data), PACKAGE, True) if data else {} + else: + own_cache[(loader, target)] = read_classes(io.BytesIO(jar_bytes), f"{PACKAGE}{loader}/{target}/", True) + own = own_cache[(loader, target)] + if not own: + skipped.append(f"{loader}:{minecraft} (no classes for {target})") + continue + checked += 1 + problems = check(own, reference, actual) + if problems: + failed += 1 + print(f"{loader}:{minecraft} (built for {built_for[target]}): {len(problems)} problem(s)") + for problem in problems: + print(" " + problem) + print(f"checked {checked} combination(s), {failed} with problems") + if skipped: + print("skipped (the Minecraft jar in runtime names is not available): " + ", ".join(skipped)) + sys.exit(1 if failed else 0) + + +if __name__ == "__main__": + main() diff --git a/tools/gen_adapters.py b/tools/gen_adapters.py new file mode 100644 index 00000000..b0bee87a --- /dev/null +++ b/tools/gen_adapters.py @@ -0,0 +1,2468 @@ +"""Minecraft 1.14 以降向けの実装 (adapters/ 以下) のうち、バージョンによって細部が違うファイルを書き出す。 + + python tools/gen_adapters.py + +API の細かい違いごとに同じ内容のファイルを手で保つのは間違いのもとなので、違う部分だけを差し替えて生成している。 +生成したファイルもリポジトリに入れてあるので、ビルドにこのスクリプトは必要ない。 +対象のファイルを変更するときは、このスクリプトを直して実行し直すこと (直接編集すると、次の実行で上書きされる)。 +1.7.10 - 1.12.2 向け (adapters/legacy, v1_7 - v1_12) と、adapters/common, adapters/renderstate は手書きで、対象外。 + +層の構成: + modern/ どのバージョンでも共通 (Adapter, PlatformImpl) + classic/ 1.21.8 以前: 従来の看板レンダラーと画面入力 + renderstate/ 1.21.9 以降: レンダー状態を使う看板レンダラーとイベント形式の画面入力 + tex_*/ テクスチャの作り方の違い + v*/ バージョンごとの差分 (Mc, UiScreen, SignRendererWrapper) +""" +from pathlib import Path + +REPO = Path(__file__).resolve().parents[1] +PK = "java/marumasa/marumasa_sign/adapter" + + +def write(layer, name, text): + path = REPO / "adapters" / layer / "main" / PK / name + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(text.lstrip("\n"), encoding="utf-8", newline="\n") + + +# ---------------------------------------------------------------- modern + +write("modern", "Adapter.java", r''' +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.InputConstants; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.util.OptionsFile; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; + +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * Minecraft 1.14 以降向けの実装の入口。バージョンによって違う部分は Mc クラスなどにまとめてある。 + * ローダーの API を使わずに済むよう、タイマーから定期的にメインスレッドへ処理を渡している。 + */ +public final class Adapter { + + // 処理を呼ぶ間隔 (ミリ秒)。ゲームの 1 tick と同じ + private static final long INTERVAL = 50; + // GLFW の B キー + private static final int KEY_B = 66; + + private static final AtomicBoolean started = new AtomicBoolean(); + // メインスレッドに渡した処理がまだ実行されていないかどうか + private static final AtomicBoolean pending = new AtomicBoolean(); + + private static String loaderName; + // この実装が core を初期化したかどうか (他の経路で既に起動していれば false のまま) + private static boolean active; + private static boolean initialized; + private static KeyMapping openMenu; + + private Adapter() { + } + + // loader: 起動したローダーの名前 + public static void start(String loader) { + if (!started.compareAndSet(false, true)) return; + loaderName = loader; + new Timer("MarumaSign-Tick", true).schedule(new TimerTask() { + @Override + public void run() { + final Minecraft mc = Minecraft.getInstance(); + if (mc == null || !pending.compareAndSet(false, true)) return; + mc.execute(Adapter::tick); + } + }, INTERVAL, INTERVAL); + } + + private static void tick() { + pending.set(false); + final Minecraft mc = Minecraft.getInstance(); + if (!initialized) { + // 設定の読み込みが終わるまで待つ + if (mc.options == null) return; + initialized = true; + if (MarumaSign.isInitialized()) return; + MarumaSign.init(new PlatformImpl(loaderName)); + active = true; + registerKey(mc); + } + if (!active) return; + + SignRendererBase.install(mc); + SignItems.install(mc); + MarumaSign.tick(); + if (mc.player != null && "forge".equals(loaderName)) Mc.avoidExactAngles(mc); + + while (openMenu.consumeClick()) { + if (mc.player != null && Mc.screen(mc) == null) MarumaSign.openMenu(); + } + + // 看板の編集画面が開かれたら、予約されている文字列を書き込んで閉じる + if (MarumaSign.hasPendingWrite() && Mc.isSignEdit(Mc.screen(mc))) { + final String[] lines = MarumaSign.takePendingWrite(); + if (lines != null) Mc.fillSign(Mc.screen(mc), lines); + // 画面を閉じると、看板の内容がサーバーへ送信される + Mc.setScreen(mc, null); + } + } + + // キーバインド登録 + private static void registerKey(Minecraft mc) { + openMenu = Mc.newKey("MarumaSign", KEY_B); + final KeyMapping[] current = mc.options.keyMappings; + final KeyMapping[] extended = new KeyMapping[current.length + 1]; + System.arraycopy(current, 0, extended, 0, current.length); + extended[current.length] = openMenu; + Reflect.set(Reflect.fieldHolding(mc.options, current), mc.options, extended); + // 保存されているキーの割り当てを反映する + final String saved = OptionsFile.read(mc.gameDirectory, "key_MarumaSign"); + if (saved != null && !saved.isEmpty()) { + try { + openMenu.setKey(InputConstants.getKey(saved)); + } catch (RuntimeException e) { + // 読めない値なら既定のキーのままにする + } + } + KeyMapping.resetMapping(); + } +} +''') + +write("modern", "PlatformImpl.java", r''' +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.Platform; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; + +import java.io.File; + +final class PlatformImpl implements Platform { + + private final Minecraft mc = Minecraft.getInstance(); + private final String loaderName; + + PlatformImpl(String loaderName) { + this.loaderName = loaderName; + } + + @Override + public String minecraftVersion() { + return Mc.version(); + } + + @Override + public String loaderName() { + return loaderName; + } + + @Override + public File gameDirectory() { + return mc.gameDirectory; + } + + @Override + public String languageCode() { + return mc.options.languageCode; + } + + @Override + public void execute(Runnable task) { + mc.execute(task); + } + + @Override + public void showMessage(String message) { + Mc.chat(mc, message); + } + + @Override + public boolean isInWorld() { + return mc.level != null && mc.player != null; + } + + @Override + public int maxSignLineLength() { + return 80; + } + + @Override + public Object createTexture(int width, int height, int[] argb) { + return Tex.create(mc, width, height, argb); + } + + @Override + public void updateTexture(Object handle, int width, int height, int[] argb) { + ((Tex) handle).update(width, height, argb); + } + + @Override + public void releaseTexture(Object handle) { + ((Tex) handle).release(mc); + } + + @Override + public void openUi() { + Mc.setScreen(mc, new UiScreen()); + } + + @Override + public void closeUi() { + if (Mc.screen(mc) instanceof UiScreen) Mc.setScreen(mc, null); + } + + @Override + public boolean supportsFileDrop() { + return true; + } + + @Override + public String getClipboard() { + return mc.keyboardHandler.getClipboard(); + } + + @Override + public void setClipboard(String text) { + mc.keyboardHandler.setClipboard(text); + } + + @Override + public void selfTestLook(float pitch) { + if (mc.player != null) Mc.look(mc, pitch); + } + + @Override + public void selfTestUseItem() { + if (mc.player == null) return; + Mc.selectSign(mc); + KeyMapping.click(mc.options.keyUse.getDefaultKey()); + } + + @Override + public boolean selfTestJoin(String host, int port) { + return Join.start(mc, host, port); + } + + @Override + public void quit() { + mc.stop(); + } +} +''') + +JOIN_REAL = r''' +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; + +/** + * 動作確認のときの、サーバーへの接続。 + * Minecraft 1.14 - 1.15.1 には、起動と同時に接続すると入れない組み合わせがあるので、起動が済んでから接続する。 + */ +final class Join { + + private Join() { + } + + // タイトル画面 (または、接続に失敗したあとの画面) が出ていて、リソースの読み込みが終わっていれば、接続を始める + static boolean start(Minecraft mc, String host, int port) { + final Screen screen = mc.screen; + if (mc.getOverlay() != null || !(screen instanceof TitleScreen || screen instanceof DisconnectedScreen)) return false; + mc.setScreen(new ConnectScreen(new TitleScreen(), mc, host, port)); + return true; + } +} +''' +JOIN_NONE = r''' +package marumasa.marumasa_sign.adapter; + +import net.minecraft.client.Minecraft; + +/** + * 動作確認のときの、サーバーへの接続。このバージョンでは起動時の指定で接続できるので、何もしない。 + */ +final class Join { + + private Join() { + } + + static boolean start(Minecraft mc, String host, int port) { + return false; + } +} +''' +# 描画の層は世代ごとに 1 つだけ入るので、接続の実装もそこに置く +write("ber14", "Join.java", JOIN_REAL) +write("ber16", "Join.java", JOIN_REAL) +JOIN_LATER = r''' +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.multiplayer.resolver.ServerAddress; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +/** + * 動作確認のときの、サーバーへの接続。 + * Minecraft 1.17 は、起動と同時に接続すると落ちる (1.17.1 で直っている) ので、起動が済んでから接続する。 + */ +final class Join { + + private Join() { + } + + // タイトル画面 (または、接続に失敗したあとの画面) が出ていて、リソースの読み込みが終わっていれば、接続を始める + static boolean start(Minecraft mc, String host, int port) { + final Screen screen = mc.screen; + if (mc.getOverlay() != null || !(screen instanceof TitleScreen || screen instanceof DisconnectedScreen)) return false; + // 接続を始めるメソッドは、バージョンが上がるにつれて後ろの引数が増えているので、先頭の引数の型で探す + for (Method method : ConnectScreen.class.getMethods()) { + final Class[] types = method.getParameterTypes(); + if (!Modifier.isStatic(method.getModifiers()) || types.length < 3) continue; + if (types[0] != Screen.class || types[1] != Minecraft.class || types[2] != ServerAddress.class) continue; + final Object[] arguments = new Object[types.length]; + arguments[0] = new TitleScreen(); + arguments[1] = mc; + arguments[2] = ServerAddress.parseString(host + ":" + port); + for (int i = 3; i < types.length; i++) { + if (types[i] == boolean.class) arguments[i] = Boolean.FALSE; + } + Reflect.invoke(method, null, arguments); + return true; + } + return false; + } +} +''' +write("classic_ber", "Join.java", JOIN_LATER) +write("renderstate", "Join.java", JOIN_NONE) + +# ---------------------------------------------------------------- tex + + +def tex_source(id_type, id_import, make_id, render_import, render_factory, texture_new, set_pixel, note): + return f''' +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +{render_import} +import net.minecraft.client.renderer.texture.DynamicTexture; +{id_import} + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。{note} + */ +final class Tex {{ + + private static final AtomicInteger nextId = new AtomicInteger(); + + final {id_type} id; + private final DynamicTexture texture; + // ワールドに描くときの描画設定。文字用のものを使う。 + // 半透明に対応し、周囲の明るさは反映するが、面の向きによる陰影は付かない + final RenderType renderType; + + private Tex({id_type} id, DynamicTexture texture) {{ + this.id = id; + this.texture = texture; + this.renderType = {render_factory}(id); + }} + + private static void copy(NativeImage image, int width, int height, int[] argb) {{ + for (int y = 0; y < height; y++) {{ + final int row = y * width; + for (int x = 0; x < width; x++) {{ + {set_pixel} + }} + }} + }} + + static Tex create(Minecraft mc, int width, int height, int[] argb) {{ + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final {id_type} id = {make_id}(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = {texture_new}; + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + }} + + void update(int width, int height, int[] argb) {{ + copy(texture.getPixels(), width, height, argb); + texture.upload(); + }} + + void release(Minecraft mc) {{ + mc.getTextureManager().release(id); + }} +}} +''' + + +RL = ("ResourceLocation", "import net.minecraft.resources.ResourceLocation;") +ID = ("Identifier", "import net.minecraft.resources.Identifier;") +RT_OLD = ("import net.minecraft.client.renderer.RenderType;", "RenderType.text") +RT_NEW = ("import net.minecraft.client.renderer.rendertype.RenderType;\nimport net.minecraft.client.renderer.rendertype.RenderTypes;", "RenderTypes.text") +PIXEL_ARGB = "image.setPixel(x, y, argb[row + x]);" +# 古い API は ABGR の並びで受け取る +PIXEL_ABGR = ("final int color = argb[row + x];\n" + " image.setPixelRGBA(x, y, (color & 0xFF00FF00) | ((color & 0xFF) << 16) | ((color >> 16) & 0xFF));") + +write("tex_5", "Tex.java", tex_source(*ID, "Identifier.fromNamespaceAndPath", *RT_NEW, + 'new DynamicTexture(() -> "marumasa_sign", image)', PIXEL_ARGB, "Minecraft 1.21.11 以降の作り方。")) +write("tex_4", "Tex.java", tex_source(*RL, "ResourceLocation.fromNamespaceAndPath", *RT_OLD, + 'new DynamicTexture(() -> "marumasa_sign", image)', PIXEL_ARGB, "Minecraft 1.21.5 - 1.21.10 の作り方。")) +write("tex_3", "Tex.java", tex_source(*RL, "ResourceLocation.fromNamespaceAndPath", *RT_OLD, + "new DynamicTexture(image)", PIXEL_ARGB, "Minecraft 1.21.2 - 1.21.4 の作り方。")) +write("tex_2", "Tex.java", tex_source(*RL, "ResourceLocation.fromNamespaceAndPath", *RT_OLD, + "new DynamicTexture(image)", PIXEL_ABGR, "Minecraft 1.21 - 1.21.1 の作り方。")) +TEX_1 = tex_source(*RL, "new ResourceLocation", *RT_OLD, + "new DynamicTexture(image)", PIXEL_ABGR, "Minecraft 1.20.6 以前の作り方。") +write("tex_1", "Tex.java", TEX_1) + + +def replace_once(source, old, new): + if source.count(old) != 1: + raise SystemExit(f"expected exactly one {old!r}") + return source.replace(old, new) + + +# 1.15 - 1.15.2: テクスチャを登録するメソッドの戻り値の型が 1.15.2 で変わったので、引数の型で探して呼ぶ +TEX_1R = replace_once(TEX_1, " mc.getTextureManager().register(id, texture);\n", """ if (register == null) { + register = Reflect.methodWithParameters(TextureManager.class, ResourceLocation.class, AbstractTexture.class); + } + Reflect.invoke(register, mc.getTextureManager(), id, texture); +""") +TEX_1R = replace_once(TEX_1R, " private static final AtomicInteger nextId = new AtomicInteger();\n", + """ private static final AtomicInteger nextId = new AtomicInteger(); + // テクスチャを登録するメソッド。1.15.2 で戻り値の型が変わったので、どのバージョンでも動くように引数の型で探す + private static Method register; +""") +TEX_1R = replace_once(TEX_1R, "import net.minecraft.client.renderer.texture.DynamicTexture;\n", + "import net.minecraft.client.renderer.texture.AbstractTexture;\n" + "import net.minecraft.client.renderer.texture.DynamicTexture;\n" + "import net.minecraft.client.renderer.texture.TextureManager;\n") +TEX_1R = replace_once(TEX_1R, "import marumasa.marumasa_sign.core.MarumaSign;\n", + "import marumasa.marumasa_sign.core.MarumaSign;\nimport marumasa.marumasa_sign.core.util.Reflect;\n") +TEX_1R = replace_once(TEX_1R, "import java.util.concurrent.atomic.AtomicInteger;\n", + "import java.lang.reflect.Method;\nimport java.util.concurrent.atomic.AtomicInteger;\n") +TEX_1R = replace_once(TEX_1R, "Minecraft 1.20.6 以前の作り方。", "Minecraft 1.15 - 1.15.2 の作り方。") +write("tex_1r", "Tex.java", TEX_1R) + +# ---------------------------------------------------------------- classic + +write("classic", "UiScreenBase.java", r''' +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.Window; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.ui.Key; +import marumasa.marumasa_sign.core.ui.UiRoot; +import net.minecraft.client.gui.screens.Screen; + +import java.io.File; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +/** + * MarumaSign の画面。入力を core の UiRoot に橋渡しする。 + * 描画のメソッドはバージョンによって引数が違うため、UiScreen 側で実装する。 + */ +abstract class UiScreenBase extends Screen { + + protected final UiRoot ui = MarumaSign.ui(); + + protected UiScreenBase() { + super(Mc.text("MarumaSign")); + ui.opened(); + } + + @Override + protected void init() { + final Window window = Mc.window(minecraft); + ui.layout(window.getWidth(), window.getHeight()); + } + + @Override + public void removed() { + ui.closed(); + } + + @Override + public boolean isPauseScreen() { + return false; + } + + // 描画の直前に呼ぶ。画面に貼るテクスチャを返す (なければ null) + protected final Tex prepare() { + final Window window = Mc.window(minecraft); + ui.layout(window.getWidth(), window.getHeight()); + ui.mouseMoved(mouseX(), mouseY()); + return (Tex) ui.texture(); + } + + // GUI の拡大率を打ち消して、ピクセル単位で描くための倍率 + protected final float unscale() { + return (float) (1.0 / Mc.window(minecraft).getGuiScale()); + } + + // マウスの座標 (ウィンドウ上の位置) をフレームバッファのピクセル単位にする + private double mouseX() { + final Window window = Mc.window(minecraft); + return minecraft.mouseHandler.xpos() * window.getWidth() / Math.max(1, window.getScreenWidth()); + } + + private double mouseY() { + final Window window = Mc.window(minecraft); + return minecraft.mouseHandler.ypos() * window.getHeight() / Math.max(1, window.getScreenHeight()); + } + + @Override + public boolean mouseClicked(double x, double y, int button) { + if (button == 0) ui.mousePressed(mouseX(), mouseY()); + return true; + } + + @Override + public boolean mouseReleased(double x, double y, int button) { + if (button == 0) ui.mouseReleased(mouseX(), mouseY()); + return true; + } + + // スクロールのメソッドはバージョンによって引数の数が違う。 + // 両方を用意しておき、そのバージョンにあるほうが呼ばれる (そのため @Override は付けない) + public boolean mouseScrolled(double x, double y, double amount) { + ui.mouseScrolled(mouseX(), mouseY(), amount); + return true; + } + + public boolean mouseScrolled(double x, double y, double scrollX, double scrollY) { + ui.mouseScrolled(mouseX(), mouseY(), scrollY); + return true; + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + final int key = Key.fromGlfw(keyCode); + if (key != Key.UNKNOWN) ui.keyPressed(key, Key.modifiersFromGlfw(modifiers)); + return true; + } + + @Override + public boolean charTyped(char character, int modifiers) { + ui.charTyped(character); + return true; + } + + // ファイルのドロップは 1.15 以降にしかないため、@Override は付けない + public void onFilesDrop(List paths) { + final List files = new ArrayList(); + for (Path path : paths) { + files.add(path.toFile()); + } + ui.filesDropped(files); + } +} +''') + +write("classic_ber", "SignRendererBase.java", r''' +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + * render の引数はバージョンによって違うため、SignRendererWrapper 側で実装する。 + */ +abstract class SignRendererBase implements BlockEntityRenderer { + + private static Field renderersField; + + protected final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + protected SignRendererBase(BlockEntityRenderer delegate) { + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + final BlockEntityRenderDispatcher dispatcher = mc.getBlockEntityRenderDispatcher(); + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(Mc.SIGN); + if (current == null || current instanceof SignRendererBase) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map, BlockEntityRenderer> replaced = new HashMap, BlockEntityRenderer>(renderers); + replaced.put(Mc.SIGN, new SignRendererWrapper((BlockEntityRenderer) current)); + Reflect.set(renderersField, dispatcher, replaced); + } + + /** + * MarumaSign の看板なら画像を描く。 + * 看板そのものも描くべきなら true を返す (MarumaSign の看板でないとき、またはスペクテイターのとき)。 + */ + protected final boolean drawImage(SignBlockEntity sign, PoseStack poseStack, MultiBufferSource buffers, int light) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + if (image == null) return true; + + final BlockState blockState = sign.getBlockState(); + final boolean wall; + final float yaw; + if (blockState.getBlock() instanceof WallSignBlock) { + wall = true; + yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + wall = false; + yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + return true; + } + + for (SignImage.Batch batch : image.batches(yaw, wall, distance(sign))) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + return mc.player != null && mc.player.isSpectator(); + } + + // カメラから看板までの距離 (ブロック) + private double distance(SignBlockEntity sign) { + final Vec3 camera = mc.gameRenderer.getMainCamera().getPosition(); + final double x = sign.getBlockPos().getX() + 0.5 - camera.x; + final double y = sign.getBlockPos().getY() + 0.5 - camera.y; + final double z = sign.getBlockPos().getZ() + 0.5 - camera.z; + return Math.sqrt(x * x + y * y + z * z); + } + + // 以下のメソッドはバージョンによって有無や引数が違う。 + // 両方を用意しておき、そのバージョンにあるほうが使われる (そのため @Override は付けない) + + public boolean shouldRenderOffScreen() { + return true; + } + + public boolean shouldRenderOffScreen(SignBlockEntity sign) { + return true; + } + + public int getViewDistance() { + return 512; + } + + public boolean shouldRender(SignBlockEntity sign, Vec3 cameraPosition) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + final double distance = image == null ? 64.0 : image.viewDistance(); + final double x = sign.getBlockPos().getX() + 0.5 - cameraPosition.x; + final double y = sign.getBlockPos().getY() + 0.5 - cameraPosition.y; + final double z = sign.getBlockPos().getZ() + 0.5 - cameraPosition.z; + return x * x + y * y + z * z < distance * distance; + } +} +''') + +# ---------------------------------------------------------------- per-era files + + +def screen_source(graphics_import, graphics_type, method, body): + return f''' +package marumasa.marumasa_sign.adapter; + +{graphics_import} + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase {{ + + @Override + public void {method}({graphics_type} graphics, int mouseX, int mouseY, float partialTicks) {{ + final Tex texture = prepare(); + if (texture == null) return; + +{body} + }} +}} +''' + + +# 1.21.6 以降: 2 次元の行列スタックと、範囲を指定する blit +BLIT_2D = ''' final float unscale = unscale(); + graphics.pose().pushMatrix(); + graphics.pose().scale(unscale, unscale); + graphics.blit(texture.id, + ui.originX(), ui.originY(), ui.originX() + ui.pixelWidth(), ui.originY() + ui.pixelHeight(), + 0f, 1f, 0f, 1f); + graphics.pose().popMatrix();''' + +SCREEN_EXTRACTOR = screen_source("import net.minecraft.client.gui.GuiGraphicsExtractor;", "GuiGraphicsExtractor", "extractRenderState", BLIT_2D) +SCREEN_GRAPHICS_2D = screen_source("import net.minecraft.client.gui.GuiGraphics;", "GuiGraphics", "render", BLIT_2D) + + +def wrapper_renderstate(camera_import, frustum): + return f''' +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import {camera_import}; +import net.minecraft.world.level.block.entity.SignBlockEntity; + +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase {{ + + SignRendererWrapper(BlockEntityRenderer delegate) {{ + super(delegate); + }} + + @Override + public void submit(State state, PoseStack poseStack, SubmitNodeCollector collector, CameraRenderState camera) {{ + if (drawsVanilla(state)) delegate.submit(state.inner, poseStack, collector, camera); +{frustum} + }} +}} +''' + + +WRAPPER_RS_26 = wrapper_renderstate("net.minecraft.client.renderer.state.level.CameraRenderState", + " submitImage(state, poseStack, collector, camera.cullFrustum);") +WRAPPER_RS_121 = wrapper_renderstate("net.minecraft.client.renderer.state.CameraRenderState", + " // このバージョンのカメラの状態は視錐台を持たないため、カリングは描画側に任せる\n" + " submitImage(state, poseStack, collector, null);") + + +def wrapper_classic(extra_param, extra_arg, extra_import): + return f''' +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.entity.SignBlockEntity; +{extra_import} +/** + * 看板のレンダラーを包むクラスの、描画の受け口。 + */ +final class SignRendererWrapper extends SignRendererBase {{ + + SignRendererWrapper(BlockEntityRenderer delegate) {{ + super(delegate); + }} + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay{extra_param}) {{ + if (drawImage(sign, poseStack, buffers, light)) {{ + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay{extra_arg}); + }} + }} +}} +''' + + +WRAPPER_CLASSIC_VEC3 = wrapper_classic(", Vec3 cameraPosition", ", cameraPosition", "import net.minecraft.world.phys.Vec3;\n") +WRAPPER_CLASSIC = wrapper_classic("", "", "") + + +def mc_source(title, imports, sign_type, screen_get, screen_set, chat, text, key, version, sign_text, edit_class, look, select, quads, + window="mc.getWindow()"): + quads_block = "" + if quads: + quads_block = f''' + // 頂点を描画用のバッファに書き込む + static void quads(VertexConsumer vertices, PoseStack poseStack, SignImage.Batch batch, int light) {{ +{quads} + }} +''' + return f''' +package marumasa.marumasa_sign.adapter; + +{imports} + +/** + * {title} に固有の部分。 + */ +final class Mc {{ + + // 看板のブロックエンティティタイプ + static final BlockEntityType SIGN = {sign_type}; + + private static Field signMessages; + + private Mc() {{ + }} + + static String version() {{ + return {version}; + }} + + static Window window(Minecraft mc) {{ + return {window}; + }} + + static Screen screen(Minecraft mc) {{ + return {screen_get}; + }} + + static void setScreen(Minecraft mc, Screen screen) {{ + {screen_set}; + }} + + static Component text(String text) {{ + return {text}; + }} + + // チャット欄にクライアント側だけのメッセージを表示する + static void chat(Minecraft mc, String message) {{ + {chat}; + }} + + static KeyMapping newKey(String name, int keyCode) {{ + return {key}; + }} + + // 看板に書いてある文字を 1 つの文字列にする + static String signText(SignBlockEntity sign) {{ + final StringBuilder text = new StringBuilder(); +{sign_text} + return text.toString(); + }} + + static boolean isSignEdit(Screen screen) {{ + return screen instanceof {edit_class}; + }} + + // 看板の編集画面の内容を書き換える。画面を閉じるとサーバーへ送信される + static void fillSign(Screen screen, String[] lines) {{ + if (signMessages == null) signMessages = Reflect.fieldOfType({edit_class}.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4); + }} +{quads_block} + // ---------- 動作確認用 ---------- + + static void look(Minecraft mc, float pitch) {{ + {look}; + }} + + // ホットバーにある看板を手に持つ + static void selectSign(Minecraft mc) {{ + for (int slot = 0; slot < 9; slot++) {{ + if (mc.player.{select_item(select)}) {{ + {select}; + }} + }} + }} +}} +''' + + +def select_item(select): + if ".inventory." in select: + return "inventory.getItem(slot).getItem() == Items.OAK_SIGN" + return "getInventory().getItem(slot).is(Items.OAK_SIGN)" + + +BASE_IMPORTS = [ + "com.mojang.blaze3d.platform.InputConstants", + "com.mojang.blaze3d.platform.Window", + "marumasa.marumasa_sign.core.util.Reflect", + "net.minecraft.SharedConstants", + "net.minecraft.client.KeyMapping", + "net.minecraft.client.Minecraft", + "net.minecraft.client.gui.screens.Screen", + "net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen", + "net.minecraft.network.chat.Component", + "net.minecraft.world.item.Items", + "net.minecraft.world.level.block.entity.BlockEntityType", + "net.minecraft.world.level.block.entity.SignBlockEntity", +] + + +def imports(*extra, drop=()): + names = sorted(set(BASE_IMPORTS + list(extra)) - set(drop)) + return "\n".join(f"import {name};" for name in names) + "\n\nimport java.lang.reflect.Field;" + + +SIGN_TEXT_FRONT_BACK = ''' final SignText front = sign.getFrontText(); + final SignText back = sign.getBackText(); + for (int i = 0; i < 4; i++) { + text.append(front.getMessage(i, false).getString()); + } + for (int i = 0; i < 4; i++) { + text.append(back.getMessage(i, false).getString()); + }''' +SIGN_TEXT_SLOTS = ''' // 表、裏の順に並んでいる + for (SignTextSlot slot : SignTextSlot.values()) { + for (Component line : sign.getText(slot).getMessages(false)) { + text.append(line.getString()); + } + }''' +QUADS_ADD_VERTEX = ''' final PoseStack.Pose pose = poseStack.last(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.addVertex(pose, mesh[o], mesh[o + 1], mesh[o + 2]) + .setColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .setUv(mesh[o + 3], mesh[o + 4]) + .setLight(light); + }''' +CLASSIC_IMPORTS = ("com.mojang.blaze3d.vertex.PoseStack", "com.mojang.blaze3d.vertex.VertexConsumer", + "marumasa.marumasa_sign.core.sign.SignImage") +KEY_STRING_CATEGORY = 'new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, "key.categories.misc")' +KEY_CATEGORY = "new KeyMapping(name, InputConstants.Type.KEYSYM, keyCode, KeyMapping.Category.MISC)" +KEY_CATEGORY_263 = "new KeyMapping(name, InputConstants.Type.KEYBOARD, keyCode, KeyMapping.Category.MISC)" + +ERAS = { + # 26.3 + "v26_3": dict( + mc=mc_source("Minecraft 26.3", + imports("net.minecraft.world.level.block.entity.BlockEntityTypes", "net.minecraft.world.level.block.entity.SignTextSlot"), + "BlockEntityTypes.SIGN", "mc.gui.screen()", "mc.gui.setScreen(screen)", + "mc.gui.hud.getChat().addClientSystemMessage(Component.literal(message))", "Component.literal(text)", + KEY_CATEGORY_263, "SharedConstants.getCurrentVersion().name()", SIGN_TEXT_SLOTS, "AbstractSignEditScreen", + "mc.player.setXRot(pitch)", "mc.player.getInventory().setSelectedSlot(slot)", None), + ), + # 26.2 + "v26_2": dict( + mc=mc_source("Minecraft 26.2", + imports("net.minecraft.world.level.block.entity.BlockEntityTypes", "net.minecraft.world.level.block.entity.SignText"), + "BlockEntityTypes.SIGN", "mc.gui.screen()", "mc.gui.setScreen(screen)", + "mc.gui.hud.getChat().addClientSystemMessage(Component.literal(message))", "Component.literal(text)", + KEY_CATEGORY, "SharedConstants.getCurrentVersion().name()", SIGN_TEXT_FRONT_BACK, "AbstractSignEditScreen", + "mc.player.setXRot(pitch)", "mc.player.getInventory().setSelectedSlot(slot)", None), + ), + # 26.1 - 26.1.2 + "v26_1": dict( + mc=mc_source("Minecraft 26.1 - 26.1.2", + imports("net.minecraft.world.level.block.entity.SignText"), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + "mc.gui.getChat().addClientSystemMessage(Component.literal(message))", "Component.literal(text)", + KEY_CATEGORY, "SharedConstants.getCurrentVersion().name()", SIGN_TEXT_FRONT_BACK, "AbstractSignEditScreen", + "mc.player.setXRot(pitch)", "mc.player.getInventory().setSelectedSlot(slot)", None), + ), + # 1.21.9 - 1.21.11 + "v1_21_9": dict( + mc=mc_source("Minecraft 1.21.9 - 1.21.11", + imports("net.minecraft.world.level.block.entity.SignText"), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + "mc.gui.getChat().addMessage(Component.literal(message))", "Component.literal(text)", + KEY_CATEGORY, "SharedConstants.getCurrentVersion().name()", SIGN_TEXT_FRONT_BACK, "AbstractSignEditScreen", + "mc.player.setXRot(pitch)", "mc.player.getInventory().setSelectedSlot(slot)", None), + screen=SCREEN_GRAPHICS_2D, wrapper=WRAPPER_RS_121, + ), + # 1.21.6 - 1.21.8 + "v1_21_6": dict( + mc=mc_source("Minecraft 1.21.6 - 1.21.8", + imports("net.minecraft.world.level.block.entity.SignText", *CLASSIC_IMPORTS), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + "mc.gui.getChat().addMessage(Component.literal(message))", "Component.literal(text)", + KEY_STRING_CATEGORY, "SharedConstants.getCurrentVersion().name()", SIGN_TEXT_FRONT_BACK, "AbstractSignEditScreen", + "mc.player.setXRot(pitch)", "mc.player.getInventory().setSelectedSlot(slot)", QUADS_ADD_VERTEX), + screen=SCREEN_GRAPHICS_2D, wrapper=WRAPPER_CLASSIC_VEC3, + ), +} + +# ---- 1.20 - 1.21.5 ---- + +# 1.21.2 - 1.21.5: 描画設定を渡す blit +SCREEN_GRAPHICS_FN = screen_source( + "import net.minecraft.client.gui.GuiGraphics;\nimport net.minecraft.client.renderer.RenderType;", "GuiGraphics", "render", + """ final float unscale = unscale(); + graphics.pose().pushPose(); + graphics.pose().scale(unscale, unscale, 1f); + graphics.blit(RenderType::guiTextured, texture.id, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + graphics.pose().popPose();""") +# 1.20 - 1.21.1: 半透明を有効にしてから描く +SCREEN_GRAPHICS_OLD = screen_source( + "import com.mojang.blaze3d.systems.RenderSystem;\nimport net.minecraft.client.gui.GuiGraphics;", "GuiGraphics", "render", + """ final float unscale = unscale(); + RenderSystem.enableBlend(); + graphics.pose().pushPose(); + graphics.pose().scale(unscale, unscale, 1f); + graphics.blit(texture.id, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + graphics.pose().popPose(); + RenderSystem.disableBlend();""") + +QUADS_VERTEX = """ final Matrix4f matrix = poseStack.last().pose(); + final float[] mesh = batch.vertices; + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + final int color = colors == null ? 0xFFFFFFFF : colors[i]; + vertices.vertex(matrix, mesh[o], mesh[o + 1], mesh[o + 2]) + .color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, color >>> 24) + .uv(mesh[o + 3], mesh[o + 4]) + .uv2(light) + .endVertex(); + }""" +SELECT_FIELD = "mc.player.getInventory().selected = slot" +SELECT_METHOD = "mc.player.getInventory().setSelectedSlot(slot)" +VERSION_GET = "SharedConstants.getCurrentVersion().getName()" +VERSION_NAME = "SharedConstants.getCurrentVersion().name()" + + +def classic_mc(title, version, select, quads, *extra): + return mc_source(title, imports("net.minecraft.world.level.block.entity.SignText", *CLASSIC_IMPORTS, *extra), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + "mc.gui.getChat().addMessage(Component.literal(message))", "Component.literal(text)", + KEY_STRING_CATEGORY, version, SIGN_TEXT_FRONT_BACK, "AbstractSignEditScreen", + "mc.player.setXRot(pitch)", select, quads) + + +ERAS.update({ + "v1_21_5": dict(mc=classic_mc("Minecraft 1.21.5", VERSION_GET, SELECT_METHOD, QUADS_ADD_VERTEX), + screen=SCREEN_GRAPHICS_FN, wrapper=WRAPPER_CLASSIC_VEC3), + "v1_21_2": dict(mc=classic_mc("Minecraft 1.21.2 - 1.21.4", VERSION_GET, SELECT_FIELD, QUADS_ADD_VERTEX), + screen=SCREEN_GRAPHICS_FN, wrapper=WRAPPER_CLASSIC), + "v1_21": dict(mc=classic_mc("Minecraft 1.21 - 1.21.1", VERSION_GET, SELECT_FIELD, QUADS_ADD_VERTEX), + screen=SCREEN_GRAPHICS_OLD, wrapper=WRAPPER_CLASSIC), + "v1_20": dict(mc=classic_mc("Minecraft 1.20 - 1.20.6", VERSION_GET, SELECT_FIELD, QUADS_VERTEX, "org.joml.Matrix4f"), + screen=SCREEN_GRAPHICS_OLD, wrapper=WRAPPER_CLASSIC), +}) +# ---- 1.17 - 1.19.4 ---- + +# 1.17 - 1.19.4: 行列スタックを直接受け取り、テクスチャを指定してから描く +SCREEN_POSE = """ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiComponent; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + RenderSystem.setShaderTexture(0, texture.id); + RenderSystem.enableBlend(); + poseStack.pushPose(); + poseStack.scale(unscale, unscale, 1f); + GuiComponent.blit(poseStack, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + poseStack.popPose(); + RenderSystem.disableBlend(); + } +} +""" + +SIGN_TEXT_SINGLE = """ for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i, false).getString()); + }""" +LITERAL = ("mc.gui.getChat().addMessage(Component.literal(message))", "Component.literal(text)") +TEXT_COMPONENT = ("mc.gui.getChat().addMessage(new TextComponent(message))", "new TextComponent(text)") +SIGN_EDIT_OLD = "net.minecraft.client.gui.screens.inventory.SignEditScreen" +SIGN_EDIT_NEW = "net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen" + + +def single_sign_mc(title, component, edit_import, matrix_import, *extra): + edit_class = edit_import.rsplit(".", 1)[1] + return mc_source(title, imports(edit_import, matrix_import, *CLASSIC_IMPORTS, *extra, drop=(SIGN_EDIT_NEW,) if edit_import != SIGN_EDIT_NEW else ()), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + component[0], component[1], + KEY_STRING_CATEGORY, VERSION_GET, SIGN_TEXT_SINGLE, edit_class, + "mc.player.setXRot(pitch)", SELECT_FIELD, QUADS_VERTEX) + + +ERAS.update({ + "v1_19_3": dict(mc=single_sign_mc("Minecraft 1.19.3 - 1.19.4", LITERAL, SIGN_EDIT_NEW, "org.joml.Matrix4f"), + screen=SCREEN_POSE, wrapper=WRAPPER_CLASSIC), + "v1_19": dict(mc=single_sign_mc("Minecraft 1.19 - 1.19.2", LITERAL, SIGN_EDIT_OLD, "com.mojang.math.Matrix4f"), + screen=SCREEN_POSE, wrapper=WRAPPER_CLASSIC), + "v1_17": dict(mc=single_sign_mc("Minecraft 1.17 - 1.18.2", TEXT_COMPONENT, SIGN_EDIT_OLD, "com.mojang.math.Matrix4f", + "net.minecraft.network.chat.TextComponent"), + screen=SCREEN_POSE, wrapper=WRAPPER_CLASSIC), +}) + +# ---- 1.15 - 1.16.5 ---- + +# 1.16.5 以前: 看板レンダラーは抽象クラスで、ディスパッチャーを受け取る +write("ber16", "SignRendererBase.java", r""" +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + */ +final class SignRendererBase extends BlockEntityRenderer { + + private static Field renderersField; + + private final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + private SignRendererBase(BlockEntityRenderDispatcher dispatcher, BlockEntityRenderer delegate) { + super(dispatcher); + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + final BlockEntityRenderDispatcher dispatcher = BlockEntityRenderDispatcher.instance; + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(Mc.SIGN); + if (current == null || current instanceof SignRendererBase) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map, BlockEntityRenderer> replaced = new HashMap, BlockEntityRenderer>(renderers); + replaced.put(Mc.SIGN, new SignRendererBase(dispatcher, (BlockEntityRenderer) current)); + Reflect.set(renderersField, dispatcher, replaced); + } + + @Override + public void render(SignBlockEntity sign, float partialTicks, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + // スペクテイターには看板そのものも見せる + if (image == null || (mc.player != null && mc.player.isSpectator())) { + delegate.render(sign, partialTicks, poseStack, buffers, light, overlay); + } + if (image == null) return; + + final BlockState blockState = sign.getBlockState(); + final boolean wall; + final float yaw; + if (blockState.getBlock() instanceof WallSignBlock) { + wall = true; + yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + wall = false; + yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + return; + } + + for (SignImage.Batch batch : image.batches(yaw, wall, distance(sign))) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + } + MarumaSign.drawn(image); + } + + // カメラから看板までの距離 (ブロック) + private double distance(SignBlockEntity sign) { + final Vec3 camera = mc.gameRenderer.getMainCamera().getPosition(); + final double x = sign.getBlockPos().getX() + 0.5 - camera.x; + final double y = sign.getBlockPos().getY() + 0.5 - camera.y; + final double z = sign.getBlockPos().getZ() + 0.5 - camera.z; + return Math.sqrt(x * x + y * y + z * z); + } + + @Override + public boolean shouldRenderOffScreen(SignBlockEntity sign) { + return true; + } +} +""") + +# 1.16: 行列スタックを受け取り、テクスチャを結び付けてから描く +SCREEN_116 = """ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiComponent; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + minecraft.getTextureManager().bind(texture.id); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + poseStack.pushPose(); + poseStack.scale(unscale, unscale, 1f); + GuiComponent.blit(poseStack, ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + poseStack.popPose(); + RenderSystem.disableBlend(); + } +} +""" +# 1.15: 行列スタックを受け取らない +SCREEN_115 = """ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.systems.RenderSystem; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + minecraft.getTextureManager().bind(texture.id); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + RenderSystem.pushMatrix(); + RenderSystem.scalef(unscale, unscale, 1f); + blit(ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + RenderSystem.popMatrix(); + RenderSystem.disableBlend(); + } +} +""" + +SIGN_TEXT_OLD = """ for (int i = 0; i < 4; i++) { + text.append(sign.getMessage(i).getString()); + }""" +SELECT_OLD = "mc.player.inventory.selected = slot" + + +def old_mc(title): + return mc_source(title, + imports(SIGN_EDIT_OLD, "com.mojang.math.Matrix4f", "net.minecraft.network.chat.TextComponent", + *CLASSIC_IMPORTS, drop=(SIGN_EDIT_NEW,)), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + TEXT_COMPONENT[0], TEXT_COMPONENT[1], + KEY_STRING_CATEGORY, VERSION_GET, SIGN_TEXT_OLD, "SignEditScreen", + "mc.player.xRot = pitch", SELECT_OLD, QUADS_VERTEX) + + +# 1.16.1 以前の編集画面は、看板のブロックエンティティを直接書き換える +FILL_VIA_MESSAGES = """ if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, String[].class); + final String[] messages = Reflect.get(signMessages, screen); + System.arraycopy(lines, 0, messages, 0, 4);""" +FILL_VIA_SIGN = """ if (signMessages == null) signMessages = Reflect.fieldOfType(SignEditScreen.class, SignBlockEntity.class); + final SignBlockEntity sign = Reflect.get(signMessages, screen); + for (int i = 0; i < 4; i++) { + sign.setMessage(i, new TextComponent(lines[i])); + }""" + + +def old_mc_direct(title): + source = old_mc(title) + if source.count(FILL_VIA_MESSAGES) != 1: + raise SystemExit("fillSign body not found") + return (source.replace(FILL_VIA_MESSAGES, FILL_VIA_SIGN) + .replace(" private static Field signMessages;", " // 編集画面が持っている看板のフィールド\n private static Field signMessages;")) + + +# 1.16 系には看板の文字を取り出すメソッドがないため、フィールドから読む +SIGN_TEXT_FIELD = """ if (signLines == null) signLines = Reflect.fieldOfType(SignBlockEntity.class, Component[].class); + final Component[] lines = Reflect.get(signLines, sign); + for (Component line : lines) { + if (line != null) text.append(line.getString()); + }""" + + +def mc_116(): + source = old_mc("Minecraft 1.16 - 1.16.5") + if source.count(SIGN_TEXT_OLD) != 1: + raise SystemExit("signText body not found") + return (source.replace(SIGN_TEXT_OLD, SIGN_TEXT_FIELD) + .replace(" private static Field signMessages;", " private static Field signMessages;\n private static Field signLines;")) + + +ERAS.update({ + "v1_16": dict(mc=mc_116(), screen=SCREEN_116), + "v1_15": dict(mc=old_mc_direct("Minecraft 1.15 - 1.15.2"), screen=SCREEN_115), +}) + +# ---- 1.14 ---- + +# 1.14: 描画設定の仕組みがまだないので、テクスチャの識別子だけを持つ +write("tex_0", "Tex.java", r""" +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.NativeImage; +import marumasa.marumasa_sign.core.MarumaSign; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.resources.ResourceLocation; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * テクスチャのハンドル。Minecraft 1.14 の作り方。 + */ +final class Tex { + + private static final AtomicInteger nextId = new AtomicInteger(); + + final ResourceLocation id; + private final DynamicTexture texture; + + private Tex(ResourceLocation id, DynamicTexture texture) { + this.id = id; + this.texture = texture; + } + + private static void copy(NativeImage image, int width, int height, int[] argb) { + for (int y = 0; y < height; y++) { + final int row = y * width; + for (int x = 0; x < width; x++) { + // この API は ABGR の並びで受け取る + final int color = argb[row + x]; + image.setPixelRGBA(x, y, (color & 0xFF00FF00) | ((color & 0xFF) << 16) | ((color >> 16) & 0xFF)); + } + } + } + + static Tex create(Minecraft mc, int width, int height, int[] argb) { + final NativeImage image = new NativeImage(width, height, false); + copy(image, width, height, argb); + final ResourceLocation id = new ResourceLocation(MarumaSign.MOD_ID, "dynamic/" + nextId.incrementAndGet()); + final DynamicTexture texture = new DynamicTexture(image); + mc.getTextureManager().register(id, texture); + return new Tex(id, texture); + } + + void update(int width, int height, int[] argb) { + copy(texture.getPixels(), width, height, argb); + texture.upload(); + } + + void release(Minecraft mc) { + mc.getTextureManager().release(id); + } +} +""") + +# 1.14: 看板レンダラーはカメラからの位置を直接受け取り、OpenGL で描く +write("ber14", "SignRendererBase.java", r""" +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import org.lwjgl.opengl.GL11; + +import java.lang.reflect.Field; +import java.util.Map; + +/** + * 看板のレンダラーを包んで、MarumaSign の看板なら看板の代わりに画像を描く。 + * 元のレンダラーをそのまま使うので、他の Mod が差し替えたレンダラーとも共存できる。 + */ +final class SignRendererBase extends BlockEntityRenderer { + + private static Field renderersField; + + private final BlockEntityRenderer delegate; + private final Minecraft mc = Minecraft.getInstance(); + + private SignRendererBase(BlockEntityRenderer delegate) { + this.delegate = delegate; + } + + // 看板のレンダラーがまだ包まれていなければ包む + @SuppressWarnings("unchecked") + static void install(Minecraft mc) { + final BlockEntityRenderDispatcher dispatcher = BlockEntityRenderDispatcher.instance; + if (dispatcher == null) return; + if (renderersField == null) renderersField = Reflect.fieldOfType(BlockEntityRenderDispatcher.class, Map.class); + // このバージョンでは、ブロックエンティティのクラスをキーにした表になっている + final Map, BlockEntityRenderer> renderers = Reflect.get(renderersField, dispatcher); + if (renderers == null) return; + final BlockEntityRenderer current = renderers.get(SignBlockEntity.class); + if (current == null || current instanceof SignRendererBase) return; + + final SignRendererBase wrapper = new SignRendererBase((BlockEntityRenderer) current); + wrapper.init(dispatcher); + renderers.put(SignBlockEntity.class, wrapper); + } + + @Override + public void render(SignBlockEntity sign, double x, double y, double z, float partialTicks, int destroyStage) { + final SignImage image = MarumaSign.sign(Mc.signText(sign)); + // スペクテイターには看板そのものも見せる + if (image == null || (mc.player != null && mc.player.isSpectator())) { + delegate.render(sign, x, y, z, partialTicks, destroyStage); + } + if (image == null || destroyStage >= 0) return; + + final BlockState blockState = sign.getBlockState(); + final boolean wall; + final float yaw; + if (blockState.getBlock() instanceof WallSignBlock) { + wall = true; + yaw = blockState.getValue(WallSignBlock.FACING).toYRot(); + } else if (blockState.getBlock() instanceof StandingSignBlock) { + wall = false; + yaw = blockState.getValue(StandingSignBlock.ROTATION) * 22.5f; + } else { + return; + } + final SignImage.Batch[] batches = image.batches(yaw, wall, Math.sqrt(x * x + y * y + z * z)); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + drawBatches(batches); + GL11.glPopMatrix(); + MarumaSign.drawn(image); + } + + /** + * 四角形のまとまりを、現在の座標系に描く。看板のアイテムを描くときにも使う。 + */ + static void drawBatches(SignImage.Batch[] batches) { + // 変更した状態は glPopAttrib で元に戻す + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_CURRENT_BIT | GL11.GL_LIGHTING_BIT + | GL11.GL_DEPTH_BUFFER_BIT); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1f, 1f, 1f, 1f); + + for (SignImage.Batch batch : batches) { + Minecraft.getInstance().getTextureManager().bind(((Tex) batch.texture).id); + if (batch.colors != null) { + // 3D モデルは裏を向いた面と、透明な部分を描かない + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1f); + GL11.glDepthMask(!batch.blend); + ModelArrays.draw(batch); + continue; + } + final float[] mesh = batch.vertices; + GL11.glBegin(GL11.GL_QUADS); + for (int i = 0; i < batch.vertexCount; i++) { + final int o = i * SignImage.Batch.STRIDE; + if ((i & 3) == 0 && i + 2 < batch.vertexCount) { + // 面の向き。影 Mod が光の当たり方を計算するのに使う (通常の描画では使われない) + final int b = o + SignImage.Batch.STRIDE, c = b + SignImage.Batch.STRIDE; + final float ux = mesh[b] - mesh[o], uy = mesh[b + 1] - mesh[o + 1], uz = mesh[b + 2] - mesh[o + 2]; + final float vx = mesh[c] - mesh[o], vy = mesh[c + 1] - mesh[o + 1], vz = mesh[c + 2] - mesh[o + 2]; + final float nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) GL11.glNormal3f(nx / length, ny / length, nz / length); + } + GL11.glTexCoord2f(mesh[o + 3], mesh[o + 4]); + GL11.glVertex3f(mesh[o], mesh[o + 1], mesh[o + 2]); + } + GL11.glEnd(); + } + GL11.glPopAttrib(); + } + + @Override + public boolean shouldRenderOffScreen(SignBlockEntity sign) { + return true; + } +} +""") + +write("ber14", "ModelArrays.java", r""" +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.sign.SignImage; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL13; +import org.lwjgl.opengl.GL15; + +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.FloatBuffer; +import java.util.Map; +import java.util.WeakHashMap; + +/** + * 3D モデルの頂点を、配列にまとめて OpenGL に渡す。 + * 頂点が多いので、1 つずつ渡すと時間がかかる。 + */ +final class ModelArrays { + + private static final int BYTES_PER_VERTEX = SignImage.Batch.STRIDE * 4; + + private static final class Buffers { + final FloatBuffer vertices; + // 面の向き。影 Mod が光の当たり方を計算するのに使う + final FloatBuffer normals; + final ByteBuffer colors; + int revision = -1; + + Buffers(int vertexCount) { + vertices = BufferUtils.createFloatBuffer(vertexCount * SignImage.Batch.STRIDE); + normals = BufferUtils.createFloatBuffer(vertexCount * 3); + colors = BufferUtils.createByteBuffer(vertexCount * 4); + } + } + + // まとまりごとのバッファ。まとまりが使われなくなれば、一緒に破棄される + private static final Map BUFFERS = new WeakHashMap(); + + private ModelArrays() { + } + + static void draw(SignImage.Batch batch) { + Buffers buffers = BUFFERS.get(batch); + if (buffers == null) { + buffers = new Buffers(batch.vertexCount); + BUFFERS.put(batch, buffers); + } + if (buffers.revision != batch.revision) { + // 内容が変わったときだけ詰め直す。 + // clear などは、新しい Java とは戻り値の型が違うので、どの Java でも同じ呼び出しになるよう Buffer として呼ぶ + ((Buffer) buffers.vertices).clear(); + buffers.vertices.put(batch.vertices, 0, batch.vertexCount * SignImage.Batch.STRIDE); + ((Buffer) buffers.colors).clear(); + final int[] colors = batch.colors; + for (int i = 0; i < batch.vertexCount; i++) { + final int color = colors[i]; + buffers.colors.put((byte) (color >> 16)).put((byte) (color >> 8)).put((byte) color).put((byte) (color >>> 24)); + } + ((Buffer) buffers.colors).flip(); + fillNormals(batch, buffers.normals); + buffers.revision = batch.revision; + } + + // 変更した状態は glPopClientAttrib で元に戻す + GL11.glPushClientAttrib(GL11.GL_CLIENT_VERTEX_ARRAY_BIT); + GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); + GL13.glClientActiveTexture(GL13.GL_TEXTURE0); + GL11.glEnableClientState(GL11.GL_NORMAL_ARRAY); + GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); + GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY); + GL11.glEnableClientState(GL11.GL_COLOR_ARRAY); + // 位置とテクスチャ座標は、同じバッファに交互に入っている + ((Buffer) buffers.vertices).position(0); + GL11.glVertexPointer(3, GL11.GL_FLOAT, BYTES_PER_VERTEX, buffers.vertices); + ((Buffer) buffers.vertices).position(3); + GL11.glTexCoordPointer(2, GL11.GL_FLOAT, BYTES_PER_VERTEX, buffers.vertices); + ((Buffer) buffers.colors).position(0); + GL11.glColorPointer(4, GL11.GL_UNSIGNED_BYTE, 0, buffers.colors); + GL11.glNormalPointer(GL11.GL_FLOAT, 0, buffers.normals); + GL11.glDrawArrays(GL11.GL_QUADS, 0, batch.vertexCount); + GL11.glPopClientAttrib(); + } + + // 四角形ごとに、面の向きを求めて入れる。三角形は 3 つ目の頂点を重ねた四角形なので、最初の 3 頂点から求める + private static void fillNormals(SignImage.Batch batch, FloatBuffer normals) { + final float[] mesh = batch.vertices; + ((Buffer) normals).clear(); + for (int i = 0; i + 3 < batch.vertexCount; i += 4) { + final int a = i * SignImage.Batch.STRIDE, b = a + SignImage.Batch.STRIDE, c = b + SignImage.Batch.STRIDE; + final float ux = mesh[b] - mesh[a], uy = mesh[b + 1] - mesh[a + 1], uz = mesh[b + 2] - mesh[a + 2]; + final float vx = mesh[c] - mesh[a], vy = mesh[c + 1] - mesh[a + 1], vz = mesh[c + 2] - mesh[a + 2]; + float nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx; + final float length = (float) Math.sqrt(nx * nx + ny * ny + nz * nz); + if (length > 0) { + nx /= length; + ny /= length; + nz /= length; + } else { + // 面積のない面は、上向きとして扱う + ny = 1; + } + for (int k = 0; k < 4; k++) normals.put(nx).put(ny).put(nz); + } + ((Buffer) normals).flip(); + } +} +""") + +# 1.14: 状態の変更は GlStateManager 経由で行う +SCREEN_114 = """ +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.platform.GlStateManager; + +/** + * MarumaSign の画面の描画部分。 + */ +final class UiScreen extends UiScreenBase { + + @Override + public void render(int mouseX, int mouseY, float partialTicks) { + final Tex texture = prepare(); + if (texture == null) return; + + final float unscale = unscale(); + minecraft.getTextureManager().bind(texture.id); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.color4f(1f, 1f, 1f, 1f); + GlStateManager.pushMatrix(); + GlStateManager.scalef(unscale, unscale, 1f); + blit(ui.originX(), ui.originY(), 0f, 0f, + ui.pixelWidth(), ui.pixelHeight(), ui.pixelWidth(), ui.pixelHeight()); + GlStateManager.popMatrix(); + GlStateManager.disableBlend(); + } +} +""" + + +def mc_114(): + source = mc_source("Minecraft 1.14 - 1.14.4", + imports(SIGN_EDIT_OLD, "net.minecraft.network.chat.TextComponent", drop=(SIGN_EDIT_NEW,)), + "BlockEntityType.SIGN", "mc.screen", "mc.setScreen(screen)", + TEXT_COMPONENT[0], TEXT_COMPONENT[1], + KEY_STRING_CATEGORY, VERSION_GET, SIGN_TEXT_OLD, "SignEditScreen", + "mc.player.xRot = pitch", SELECT_OLD, None, window="mc.window") + if source.count(FILL_VIA_MESSAGES) != 1: + raise SystemExit("fillSign body not found") + return source.replace(FILL_VIA_MESSAGES, FILL_VIA_SIGN) + + +ERAS.update({ + "v1_14": dict(mc=mc_114(), screen=SCREEN_114), +}) + +# Forge の 1.15 - 1.19.4 は、カメラの向きが軸にぴったり沿っているとき (真正面を水平に見ているときなど) に、 +# 看板などの「描く範囲に限りがない」ブロックエンティティを、画面に入っていないものとして扱ってしまう +# (範囲の判定で 0 と無限大を掛けることになり、結果が数として扱えなくなるため。Mod を入れていなくても起きる)。 +# 看板の絵が突然消えて見えるので、向きがぴったりのときは、見た目に分からない程度だけずらす。 +# Forge 1.19.3 は判定の計算が変わっていて (1.19.4 で Forge 側が直した)、ぴったりでなくても 0.02 度ほどまでは同じことが起きる。 +ANGLES_FIELDS = """ + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.xRot = awayFromAxis(mc.player.xRot, true); + mc.player.yRot = awayFromAxis(mc.player.yRot, false); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +""" +ANGLES_METHODS = """ + // Forge は、カメラの向きが軸にぴったり沿っていると看板を描かないことがあるので、見た目に分からない程度だけずらす + static void avoidExactAngles(Minecraft mc) { + mc.player.setXRot(awayFromAxis(mc.player.getXRot(), true)); + mc.player.setYRot(awayFromAxis(mc.player.getYRot(), false)); + } + + // 90 度の倍数から 0.05 度以内なら、0.05 度だけ離す (画面では 1 ピクセルほどの違い)。 + // これより小さいずれは、向きを行列にする計算の途中で丸められて消えることがある + private static float awayFromAxis(float degrees, boolean vertical) { + final float nearest = Math.round(degrees / 90f) * 90f; + final float offset = degrees - nearest; + if (Math.abs(offset) >= 0.05f) return degrees; + // 上下の向きは、真上と真下を超えないように内側へずらす + if (vertical && nearest != 0f) return nearest > 0f ? nearest - 0.05f : nearest + 0.05f; + return nearest + (offset < 0f ? -0.05f : 0.05f); + } +""" +ANGLES_NONE = """ + // このバージョンでは、カメラの向きによって看板が描かれなくなる問題はない + static void avoidExactAngles(Minecraft mc) { + } +""" +ANGLES = {"v1_15": ANGLES_FIELDS, "v1_16": ANGLES_FIELDS, "v1_17": ANGLES_METHODS, "v1_19": ANGLES_METHODS, + "v1_19_3": ANGLES_METHODS} + + +def with_angles(era, source): + """Mc の最後に、カメラの向きをずらすメソッドを足す。""" + end = source.rstrip().rfind("}") + return source[:end].rstrip("\n") + "\n" + ANGLES.get(era, ANGLES_NONE) + "}\n" + + +for era, files in ERAS.items(): + write(era, "Mc.java", with_angles(era, files["mc"])) + if "screen" in files: + write(era, "UiScreen.java", files["screen"]) + if "wrapper" in files: + write(era, "SignRendererWrapper.java", files["wrapper"]) + +# ---------------------------------------------------------------- 看板アイテムの見た目 + +def item_model_source(title, read_lines, replace_layers, extra_fields, animated, extents): + """1.21.4 - 1.21.8: アイテムのモデルの表にある看板アイテムのモデルを包む。""" + return f""" +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.client.renderer.special.SpecialModelRenderer; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.nbt.Tag; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.block.StandingSignBlock; +import org.joml.Vector3f; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。({title}) + * アイテムのモデルの表にある看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ描き方を差し替える。 + */ +final class SignItems {{ + + private static Field modelsField; + private static Field layersField; + private static Field layerCountField;{extra_fields} + + private SignItems() {{ + }} + + // 看板アイテムのモデルがまだ包まれていなければ包む。リソースの再読み込みで元に戻るため、毎 tick 確認する + static void install(Minecraft mc) {{ + // アイテムの情報は、ワールドに入るまで読めないバージョンがある + if (mc.level == null) return; + final ModelManager manager = mc.getModelManager(); + if (manager == null) return; + + // 看板アイテムと、そのモデルの名前 + final List ids = new ArrayList(); + for (Item item : BuiltInRegistries.ITEM) {{ + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) continue; + final Object id = new ItemStack(item).get(DataComponents.ITEM_MODEL); + if (id != null) ids.add(id); + }} + if (ids.isEmpty()) return; + + if (modelsField == null) {{ + // アイテムのモデルの表は、同じ型のフィールドがほかにもあるので、中身で見分ける + for (Field field : ModelManager.class.getDeclaredFields()) {{ + if (!Map.class.isAssignableFrom(field.getType())) continue; + field.setAccessible(true); + final Map map = Reflect.get(field, manager); + if (map != null && map.get(ids.get(0)) instanceof ItemModel) {{ + modelsField = field; + break; + }} + }} + // まだモデルが読み込まれていない + if (modelsField == null) return; + }} + + final Map models = Reflect.get(modelsField, manager); + if (models == null) return; + boolean wrapped = true; + for (Object id : ids) {{ + final ItemModel model = models.get(id); + if (model != null && !(model instanceof Model)) wrapped = false; + }} + if (wrapped) return; + + // 元の表は変更できないことがあるので、写しを作って差し替える + final Map replaced = new HashMap(models); + for (Object id : ids) {{ + final ItemModel model = replaced.get(id); + if (model != null && !(model instanceof Model)) replaced.put(id, new Model(model)); + }} + Reflect.set(modelsField, manager, replaced); + }} + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) {{ + final CustomData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (data == null) return null; + final CompoundTag tag = data.getUnsafe(); + final String[] lines = new String[8]; +{read_lines} + return MarumaSign.itemSign(lines); + }} + + /** + * 看板アイテムのモデルを包み、MarumaSign の看板のデータを持つときだけ、中身を画像に差し替える。 + */ + private static final class Model implements ItemModel {{ + + private final ItemModel delegate; + + Model(ItemModel delegate) {{ + this.delegate = delegate; + }} + + @Override + public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, + ClientLevel level, LivingEntity entity, int seed) {{ + final SignImage image = find(stack); + if (image == null) {{ + delegate.update(state, stack, resolver, context, level, entity, seed); + return; + }} + + // 元のモデルに層を作らせて、手に持ったときや枠の中での位置と向きをそのまま使う + if (layersField == null) {{ + layersField = Reflect.fieldOfType(ItemStackRenderState.class, ItemStackRenderState.LayerRenderState[].class); + layerCountField = Reflect.fieldOfType(ItemStackRenderState.class, int.class); + }} + final int before = Reflect.get(layerCountField, state); + delegate.update(state, stack, resolver, context, level, entity, seed); + final int after = Reflect.get(layerCountField, state); + final ItemStackRenderState.LayerRenderState[] layers = Reflect.get(layersField, state); + +{replace_layers}{animated} + }} + }} + + /** + * 画像を描く部分。 + */ + private static final class Renderer implements SpecialModelRenderer {{ + + static final Renderer INSTANCE = new Renderer(); + + @Override + public void render(SignImage image, ItemDisplayContext context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay, boolean foil) {{ + if (image == null) return; + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) {{ + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + }} + MarumaSign.drawn(image); + }} +{extents} + @Override + public SignImage extractArgument(ItemStack stack) {{ + return find(stack); + }} + }} +}} +""" + + +# 1.21.4 まで: 文字は JSON の文字列として保存されている +ITEM_LINES_OLD = """ readLines(tag.getCompound("front_text"), lines, 0); + readLines(tag.getCompound("back_text"), lines, 4); + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + final ListTag messages = text.getList("messages", Tag.TAG_STRING); + for (int i = 0; i < 4 && i < messages.size(); i++) { + lines[offset + i] = messages.getString(i); + }""" +# 1.21.5 以降: 文字だけの行は文字列、装飾のある行は複合タグ +ITEM_LINES_NEW = """ readLines(tag.getCompoundOrEmpty("front_text"), lines, 0); + readLines(tag.getCompoundOrEmpty("back_text"), lines, 4); + return MarumaSign.itemSign(lines); + } + + private static void readLines(CompoundTag text, String[] lines, int offset) { + final ListTag messages = text.getListOrEmpty("messages"); + for (int i = 0; i < 4 && i < messages.size(); i++) { + final Tag message = messages.get(i); + // 文字だけの行は文字列で、装飾のある行は複合タグで保存されている + lines[offset + i] = message instanceof StringTag ? ((StringTag) message).value() : String.valueOf(message); + }""" +# 1.21.4: 層は、位置と向きを決めるためのモデルを持つ +ITEM_LAYERS_MODEL = """ if (after > before) { + // 元の絵 (板の形) は描かず、最初の層で画像を描く。位置と向きは、元のモデルのものを使う + if (layerModelField == null) layerModelField = Reflect.fieldOfType(ItemStackRenderState.LayerRenderState.class, BakedModel.class); + final BakedModel model = Reflect.get(layerModelField, layers[before]); + layers[before].setupSpecialModel(Renderer.INSTANCE, image, model); + // 残りの層には何も描かせない + for (int i = before + 1; i < after; i++) layers[i].setupSpecialModel(Renderer.INSTANCE, null, model); + }""" +# 1.21.5 以降: 層は、描く面の一覧を持つ +ITEM_LAYERS_QUADS = """ if (after > before) { + // 元の絵 (板の形) は描かず、最初の層で画像を描く。残りの層には何も描かせない + layers[before].setupSpecialModel(Renderer.INSTANCE, image); + for (int i = before + 1; i < after; i++) layers[i].setupSpecialModel(Renderer.INSTANCE, null); + } else { + state.newLayer().setupSpecialModel(Renderer.INSTANCE, image); + }""" +ITEM_ANIMATED = """ + // 動画などで内容が変わるので、枠の中の絵を使い回さず毎回描き直してもらう + state.appendModelIdentityElement(image); + state.setAnimated();""" +ITEM_EXTENTS = """ + // アイテムが占める範囲。一辺 1 の立方体の中に収まる + @Override + public void getExtents(Set output) { + output.add(new Vector3f(0f, 0f, 0f)); + output.add(new Vector3f(1f, 1f, 1f)); + } +""" + + +def item_model(title, read_lines, replace_layers, extra_fields="", animated="", extents=""): + source = item_model_source(title, "{LINES}", replace_layers, extra_fields, animated, extents) + # 行の読み取りは、メソッドの終わりまでを含む形で差し込む + marker = "{LINES}\n return MarumaSign.itemSign(lines);\n }" + if source.count(marker) != 1: + raise SystemExit("line reader marker not found") + source = source.replace(marker, read_lines + "\n }") + if "Set" not in source: + source = source.replace("import org.joml.Vector3f;\n\n", "\n").replace("import java.util.Set;\n", "") + if "BakedModel" in source: + source = source.replace("import net.minecraft.client.resources.model.ModelManager;\n", + "import net.minecraft.client.resources.model.BakedModel;\nimport net.minecraft.client.resources.model.ModelManager;\n") + if "StringTag" not in source.split("final class SignItems")[1]: + source = source.replace("import net.minecraft.nbt.StringTag;\n", "") + return source + + +write("item_model_1", "SignItems.java", item_model( + "Minecraft 1.21.4", ITEM_LINES_OLD, ITEM_LAYERS_MODEL, extra_fields="\n private static Field layerModelField;")) +write("item_model_2", "SignItems.java", item_model("Minecraft 1.21.5", ITEM_LINES_NEW, ITEM_LAYERS_QUADS)) +write("item_model_3", "SignItems.java", item_model( + "Minecraft 1.21.6 - 1.21.8", ITEM_LINES_NEW, ITEM_LAYERS_QUADS, animated=ITEM_ANIMATED, extents=ITEM_EXTENTS)) + + +def item_bewlr_source(title, context_import, context_type, built_in, shaper_methods, shaper_imports): + """1.17 - 1.21.3: アイテムのモデルを選ぶ部分と、専用の描画を行う部分を包む。""" + return f""" +package marumasa.marumasa_sign.adapter; + +import com.mojang.blaze3d.vertex.PoseStack; +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +{context_import} +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +{shaper_imports}import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。({title}) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems {{ + + private static Field shaperField; + private static Field rendererField; + + private SignItems() {{ + }} + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) {{ + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + if (rendererField == null) {{ + rendererField = Reflect.fieldOfType(ItemRenderer.class, BlockEntityWithoutLevelRenderer.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + }} + final BlockEntityWithoutLevelRenderer renderer = Reflect.get(rendererField, itemRenderer); + if (renderer != null && !(renderer instanceof Renderer)) {{ + Reflect.set(rendererField, itemRenderer, new Renderer(renderer, mc)); + }} + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) {{ + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + }} + }} + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) {{ + // 立て看板になるアイテムだけを対象にする (吊り看板は対象外) + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[8]; + if (tag.contains("front_text")) {{ + // 1.20 以降: 表と裏 + readLines(tag.getCompound("front_text"), lines, 0); + readLines(tag.getCompound("back_text"), lines, 4); + }} else {{ + for (int i = 0; i < 4; i++) {{ + lines[i] = tag.getString("Text" + (i + 1)); + }} + }} + return MarumaSign.itemSign(lines); + }} + + private static void readLines(CompoundTag text, String[] lines, int offset) {{ + // 8 は文字列のタグの種類 + final ListTag messages = text.getList("messages", 8); + for (int i = 0; i < 4 && i < messages.size(); i++) {{ + lines[offset + i] = messages.getString(i); + }} + }} + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper {{ + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) {{ + super(mc.getModelManager()); + this.delegate = delegate; + }} + + @Override + public BakedModel getItemModel(ItemStack stack) {{ + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) {{ + replaced = {built_in}; + builtIn.put(model, replaced); + }} + return replaced; + }} +{shaper_methods} + }} + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends BlockEntityWithoutLevelRenderer {{ + + private final BlockEntityWithoutLevelRenderer delegate; + + Renderer(BlockEntityWithoutLevelRenderer delegate, Minecraft mc) {{ + super(mc.getBlockEntityRenderDispatcher(), mc.getEntityModels()); + this.delegate = delegate; + }} + + @Override + public void renderByItem(ItemStack stack, {context_type} context, PoseStack poseStack, MultiBufferSource buffers, + int light, int overlay) {{ + final SignImage image = find(stack); + if (image == null) {{ + delegate.renderByItem(stack, context, poseStack, buffers, light, overlay); + return; + }} + // 距離は分からないので、手元にあるものとして扱う + for (SignImage.Batch batch : image.itemBatches(1.0)) {{ + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + }} + MarumaSign.drawn(image); + }} + + @Override + public void onResourceManagerReload(ResourceManager resourceManager) {{ + delegate.onResourceManagerReload(resourceManager); + }} + }} +}} +""" + + +# 1.21.1 まで: モデルの表は、アイテムごとに登録する形 +SHAPER_METHODS_OLD = """ + @Override + public BakedModel getItemModel(Item item) { + return delegate.getItemModel(item); + } + + @Override + public ModelManager getModelManager() { + return delegate.getModelManager(); + } + + @Override + public void register(Item item, ModelResourceLocation location) { + delegate.register(item, location); + } + + @Override + public void rebuildCache() { + delegate.rebuildCache(); + builtIn.clear(); + }""" +SHAPER_IMPORTS_OLD = ("import net.minecraft.client.renderer.block.model.ItemOverrides;\n" + "import net.minecraft.client.resources.model.ModelManager;\n" + "import net.minecraft.client.resources.model.ModelResourceLocation;\n") +BUILT_IN_OLD = "new BuiltInModel(model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon(), model.usesBlockLight())" +# 1.21.2 - 1.21.3: モデルは名前で引く +SHAPER_METHODS_NEW = """ + @Override + public BakedModel getItemModel(ResourceLocation location) { + return delegate.getItemModel(location); + } + + @Override + public void invalidateCache() { + delegate.invalidateCache(); + builtIn.clear(); + }""" +SHAPER_IMPORTS_NEW = "import net.minecraft.resources.ResourceLocation;\n" +BUILT_IN_NEW = "new BuiltInModel(model.getTransforms(), model.getParticleIcon(), model.usesBlockLight())" + + +def sorted_imports(source): + """生成したソースの import を、ほかのファイルと同じ並び (名前順) に直す。""" + lines = source.split("\n") + first = next(i for i, line in enumerate(lines) if line.startswith("import com.mojang")) + last = next(i for i, line in enumerate(lines) if line.startswith("import net.minecraft.world.level.block.StandingSignBlock")) + block = sorted(line for line in lines[first:last + 1] if line) + return "\n".join(lines[:first] + block + lines[last + 1:]) + + +write("item_bewlr_1", "SignItems.java", sorted_imports(item_bewlr_source( + "Minecraft 1.17 - 1.19.2", "import net.minecraft.client.renderer.block.model.ItemTransforms;", "ItemTransforms.TransformType", + BUILT_IN_OLD, SHAPER_METHODS_OLD, SHAPER_IMPORTS_OLD))) +write("item_bewlr_2", "SignItems.java", sorted_imports(item_bewlr_source( + "Minecraft 1.19.3 - 1.21.1", "import net.minecraft.world.item.ItemDisplayContext;", "ItemDisplayContext", + BUILT_IN_OLD, SHAPER_METHODS_OLD, SHAPER_IMPORTS_OLD))) +write("item_bewlr_3", "SignItems.java", sorted_imports(item_bewlr_source( + "Minecraft 1.21.2 - 1.21.3", "import net.minecraft.world.item.ItemDisplayContext;", "ItemDisplayContext", + BUILT_IN_NEW, SHAPER_METHODS_NEW, SHAPER_IMPORTS_NEW))) + +# アイテムが持っているブロックエンティティのデータの取り出し方 +write("item_nbt", "SignItemData.java", """ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; + +/** + * アイテムが持っているブロックエンティティのデータ。(Minecraft 1.20.4 まで: アイテムのタグの中にある) + */ +final class SignItemData { + + private SignItemData() { + } + + // データがなければ null + static CompoundTag blockEntityTag(ItemStack stack) { + final CompoundTag tag = stack.getTag(); + // 10 は複合タグの種類 + return tag != null && tag.contains("BlockEntityTag", 10) ? tag.getCompound("BlockEntityTag") : null; + } +} +""") +write("item_components", "SignItemData.java", """ +package marumasa.marumasa_sign.adapter; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; + +/** + * アイテムが持っているブロックエンティティのデータ。(Minecraft 1.20.5 以降: アイテムのコンポーネントになっている) + */ +final class SignItemData { + + private SignItemData() { + } + + // データがなければ null + static CompoundTag blockEntityTag(ItemStack stack) { + final CustomData data = stack.get(DataComponents.BLOCK_ENTITY_DATA); + // 読むだけなので、写しを作らずに中身をそのまま使う + return data == null ? null : data.getUnsafe(); + } +} +""") + + +def item_static_source(title, renderer_class, renderer_import, render_signature, render_delegate, draw, extra_imports, built_in): + """1.14 - 1.16.5: 専用の描画を行う部分が、ゲーム全体で 1 つの static なフィールドになっているバージョン。""" + source = f""" +package marumasa.marumasa_sign.adapter; + +import marumasa.marumasa_sign.core.MarumaSign; +import marumasa.marumasa_sign.core.sign.SignImage; +import marumasa.marumasa_sign.core.util.Reflect; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemModelShaper; +{renderer_import} +{extra_imports}import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.BuiltInModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.StandingSignBlock; + +import java.lang.reflect.Field; +import java.util.IdentityHashMap; +import java.util.Map; + +/** + * 看板の文字を持っている看板アイテムを、その看板と同じ内容 (画像・動画・3D モデル) で描く。({title}) + * アイテムのモデルを選ぶ部分を包んで、MarumaSign の看板のデータを持つアイテムには「専用の描画を行うモデル」を返し、 + * 専用の描画を行う部分を包んで、そのアイテムのときに画像を描く。 + */ +final class SignItems {{ + + private static Field shaperField; + private static Field rendererField; + + private SignItems() {{ + }} + + // まだ包まれていなければ包む。毎 tick 確認する + static void install(Minecraft mc) {{ + final ItemRenderer itemRenderer = mc.getItemRenderer(); + if (itemRenderer == null) return; + + // 専用の描画を行う部分は、ゲーム全体で 1 つだけあり、書き換えられないフィールドに入っている + if (rendererField == null) {{ + rendererField = Reflect.fieldOfType({renderer_class}.class, {renderer_class}.class); + shaperField = Reflect.fieldOfType(ItemRenderer.class, ItemModelShaper.class); + }} + final {renderer_class} renderer = Reflect.get(rendererField, null); + if (renderer != null && !(renderer instanceof Renderer)) {{ + Reflect.setStaticFinal(rendererField, new Renderer(renderer)); + }} + final ItemModelShaper shaper = Reflect.get(shaperField, itemRenderer); + if (shaper != null && !(shaper instanceof Shaper)) {{ + Reflect.set(shaperField, itemRenderer, new Shaper(shaper, mc)); + }} + }} + + // アイテムが持っている看板のデータから、表示する内容を探す。MarumaSign の看板でなければ null + static SignImage find(ItemStack stack) {{ + // 立て看板になるアイテムだけを対象にする + final Item item = stack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof StandingSignBlock)) return null; + final CompoundTag tag = SignItemData.blockEntityTag(stack); + if (tag == null) return null; + + final String[] lines = new String[4]; + for (int i = 0; i < 4; i++) {{ + lines[i] = tag.getString("Text" + (i + 1)); + }} + return MarumaSign.itemSign(lines); + }} + + /** + * アイテムのモデルを選ぶ部分。MarumaSign の看板のデータを持つアイテムには、専用の描画を行うモデルを返す。 + */ + private static final class Shaper extends ItemModelShaper {{ + + private final ItemModelShaper delegate; + // 元のモデルごとの、専用の描画を行うモデル。位置と向きは元のモデルと同じ + private final Map builtIn = new IdentityHashMap(); + + Shaper(ItemModelShaper delegate, Minecraft mc) {{ + super(mc.getModelManager()); + this.delegate = delegate; + }} + + @Override + public BakedModel getItemModel(ItemStack stack) {{ + final BakedModel model = delegate.getItemModel(stack); + if (model == null || find(stack) == null) return model; + BakedModel replaced = builtIn.get(model); + if (replaced == null) {{ + replaced = {built_in}; + builtIn.put(model, replaced); + }} + return replaced; + }} + + @Override + public BakedModel getItemModel(Item item) {{ + return delegate.getItemModel(item); + }} + + @Override + public ModelManager getModelManager() {{ + return delegate.getModelManager(); + }} + + @Override + public void register(Item item, ModelResourceLocation location) {{ + delegate.register(item, location); + }} + + @Override + public void rebuildCache() {{ + delegate.rebuildCache(); + builtIn.clear(); + }} + }} + + /** + * 専用の描画を行う部分。MarumaSign の看板アイテムのときだけ画像を描き、それ以外は元の処理に任せる。 + */ + private static final class Renderer extends {renderer_class} {{ + + private final {renderer_class} delegate; + + Renderer({renderer_class} delegate) {{ + this.delegate = delegate; + }} + + @Override + public void renderByItem({render_signature}) {{ + final SignImage image = find(stack); + if (image == null) {{ + delegate.renderByItem({render_delegate}); + return; + }} + // 距離は分からないので、手元にあるものとして扱う +{draw} + MarumaSign.drawn(image); + }} + }} +}} +""" + lines = source.split("\n") + first = next(i for i, line in enumerate(lines) if line.startswith("import marumasa.marumasa_sign.core.MarumaSign")) + last = next(i for i, line in enumerate(lines) if line.startswith("import net.minecraft.world.level.block.StandingSignBlock")) + block = sorted(line for line in lines[first:last + 1] if line) + return "\n".join(lines[:first] + block + lines[last + 1:]) + + +ITEM_DRAW_BUFFERS = """ for (SignImage.Batch batch : image.itemBatches(1.0)) { + Mc.quads(buffers.getBuffer(((Tex) batch.texture).renderType), poseStack, batch, light); + }""" +ITEM_BUFFER_IMPORTS = "import com.mojang.blaze3d.vertex.PoseStack;\nimport net.minecraft.client.renderer.MultiBufferSource;\n" +BUILT_IN_114 = "new BuiltInModel(model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon())" +# 1.15.2 で「横から光を受けるか」の引数が増えた。1.15 と 1.15.1 でも動くように、引数の数で選ぶ。 +# 絵は平らなアイテムと同じ光の当て方で描くので、増えた引数は false にする +BUILT_IN_115 = ("Reflect.construct(BuiltInModel.class, model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon(), Boolean.FALSE);\n" + " if (replaced == null) replaced = Reflect.construct(BuiltInModel.class, model.getTransforms(), ItemOverrides.EMPTY, model.getParticleIcon())") + +write("item_static_1", "SignItems.java", item_static_source( + "Minecraft 1.14 - 1.14.4", "EntityBlockRenderer", "import net.minecraft.client.renderer.EntityBlockRenderer;", + "ItemStack stack", "stack", " SignRendererBase.drawBatches(image.itemBatches(1.0));", "", BUILT_IN_114)) +write("item_static_2", "SignItems.java", item_static_source( + "Minecraft 1.15 - 1.15.2", "BlockEntityWithoutLevelRenderer", "import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;", + "ItemStack stack, PoseStack poseStack, MultiBufferSource buffers, int light, int overlay", + "stack, poseStack, buffers, light, overlay", ITEM_DRAW_BUFFERS, ITEM_BUFFER_IMPORTS, BUILT_IN_115)) +write("item_static_3", "SignItems.java", item_static_source( + "Minecraft 1.16 - 1.16.5", "BlockEntityWithoutLevelRenderer", "import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;", + "ItemStack stack, ItemTransforms.TransformType context, PoseStack poseStack, MultiBufferSource buffers, int light, int overlay", + "stack, context, poseStack, buffers, light, overlay", ITEM_DRAW_BUFFERS, + ITEM_BUFFER_IMPORTS + "import net.minecraft.client.renderer.block.model.ItemTransforms;\n", BUILT_IN_OLD)) +# 26.x 共通の画面とレンダラーの受け口 +write("v26", "UiScreen.java", SCREEN_EXTRACTOR) +write("v26", "SignRendererWrapper.java", WRAPPER_RS_26) +print("generated") diff --git a/tools/gen_targets.py b/tools/gen_targets.py new file mode 100644 index 00000000..61e20ce2 --- /dev/null +++ b/tools/gen_targets.py @@ -0,0 +1,237 @@ +"""targets.json を生成する。 + +対応するバージョンが多く、手で書くと間違えやすいため、表からまとめて作る。 +バージョンを追加・変更するときは、このファイルの表を直して実行する。 + + python tools/gen_targets.py +""" + +import json +from pathlib import Path + +REPO = Path(__file__).resolve().parents[1] + + +def legacy_sources(era, item, forge="legacy/forge"): + """Minecraft 1.7.10 - 1.12.2 の世代で使うソースフォルダ。item は看板アイテムの見た目を差し替える層。""" + sources = {"main": ["legacy/main", f"{era}/main", f"{item}/main"], "forge": [forge], "liteloader": ["legacy/liteloader"]} + # ローダーごとのコードを持つ層もある + for loader in ("forge", "liteloader"): + if (REPO / "adapters" / item / loader).is_dir(): + sources[loader].append(f"{item}/{loader}") + return sources + + +def modern_sources(*layers): + """Minecraft 1.14 以降の世代で使うソースフォルダ。共通のものから順に重ねる。入口はどのバージョンでも共通。""" + return {"main": [f"{layer}/main" for layer in layers], "fabric": ["common/fabric"], "forge": ["common/forge"], + "neoforge": ["common/neoforge"]} + + +ERAS = { + "v1_7": {"sources": legacy_sources("v1_7", "item_legacy17", "v1_7/forge")}, + "v1_8_0": {"sources": legacy_sources("v1_8_0", "item_mesher")}, + "v1_8": {"sources": legacy_sources("v1_8", "item_mesher")}, + "v1_9": {"sources": legacy_sources("v1_9", "item_render")}, + "v1_10": {"sources": legacy_sources("v1_10", "item_render")}, + "v1_11": {"sources": legacy_sources("v1_11", "item_render")}, + "v1_12": {"sources": legacy_sources("v1_12", "item_render")}, + "v1_14": {"sources": modern_sources("modern", "classic", "ber14", "tex_0", "v1_14", "item_static_1", "item_nbt")}, + "v1_15": {"sources": modern_sources("modern", "classic", "ber16", "tex_1r", "v1_15", "item_static_2", "item_nbt")}, + "v1_16": {"sources": modern_sources("modern", "classic", "ber16", "tex_1", "v1_16", "item_static_3", "item_nbt")}, + "v1_17": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_1", "v1_17", "item_bewlr_1", "item_nbt")}, + "v1_19": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_1", "v1_19", "item_bewlr_1", "item_nbt")}, + # 1.19.4 で、アイテムを描くときに渡される「表示のされ方」の型が変わった + "v1_19_3": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_1", "v1_19_3", "item_bewlr_1", "item_nbt")}, + "v1_19_4": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_1", "v1_19_3", "item_bewlr_2", "item_nbt")}, + "v1_20": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_1", "v1_20", "item_bewlr_2", "item_nbt")}, + # 1.20.5 で、アイテムのデータの持ち方が変わった + "v1_20_5": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_1", "v1_20", "item_bewlr_2", "item_components")}, + "v1_21": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_2", "v1_21", "item_bewlr_2", "item_components")}, + "v1_21_2": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_3", "v1_21_2", "item_bewlr_3", "item_components")}, + "v1_21_4": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_3", "v1_21_2", "item_model_1")}, + "v1_21_5": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_4", "v1_21_5", "item_model_2")}, + "v1_21_6": {"sources": modern_sources("modern", "classic", "classic_ber", "tex_4", "v1_21_6", "item_model_3")}, + "v1_21_9": {"sources": modern_sources("modern", "renderstate", "tex_4", "v1_21_9", "board_none")}, + "v1_21_11": {"sources": modern_sources("modern", "renderstate", "tex_5", "v1_21_9", "board_none")}, + "v26_1": {"sources": modern_sources("modern", "renderstate", "tex_5", "v26", "v26_1", "board_none")}, + "v26_2": {"sources": modern_sources("modern", "renderstate", "tex_5", "v26", "v26_2", "board_model")}, + "v26_3": {"sources": modern_sources("modern", "renderstate", "tex_5", "v26", "v26_3", "board_model")}, +} + +# Minecraft 1.14 以降。1 つのビルドが、API の同じ複数のバージョンを受け持つ。 +# (ビルドに使う Minecraft, 世代, マッピング, {受け持つバージョン: (Forge, NeoForge)}) +# Forge / NeoForge が None のバージョンは、そのローダーが存在しないか、まだ対応していない。 +FABRIC_LOADER = "0.19.5" +# Forge が足したメソッドと、公式の名前に直した Minecraft のメソッドが同じ名前になるバージョンでの回避。 +# [クラス, "メソッド;シグネチャ", 付け直す名前] (名前は SRG のもの) +FORGE_STUBS = { + "1.16.1": [["net/minecraft/client/gui/widget/Widget", "func_238483_d_;()I", "getHeightRealms"]], +} +MODERN = [ + ("1.14.4", "v1_14", "mojmap", { + "1.14": (None, None), + "1.14.1": (None, None), + "1.14.2": ("26.0.63", None), + "1.14.3": ("27.0.60", None), + "1.14.4": ("28.2.26", None), + }), + ("1.15.2", "v1_15", "mojmap", { + "1.15": ("29.0.4", None), + "1.15.1": ("30.0.51", None), + "1.15.2": ("31.2.57", None), + }), + ("1.16.1", "v1_16", "mojmap", { + "1.16": (None, None), + "1.16.1": ("32.0.108", None), + }), + ("1.16.5", "v1_16", "mojmap", { + "1.16.2": ("33.0.61", None), + "1.16.3": ("34.1.42", None), + "1.16.4": ("35.1.37", None), + "1.16.5": ("36.2.42", None), + }), + ("1.17.1", "v1_17", "mojmap", { + "1.17": (None, None), + "1.17.1": ("37.1.1", None), + }), + ("1.18.2", "v1_17", "mojmap", { + "1.18": ("38.0.17", None), + "1.18.1": ("39.1.2", None), + "1.18.2": ("40.3.12", None), + }), + ("1.19.2", "v1_19", "mojmap", { + "1.19": ("41.1.0", None), + "1.19.1": ("42.0.9", None), + "1.19.2": ("43.5.2", None), + }), + ("1.19.3", "v1_19_3", "mojmap", { + "1.19.3": ("44.1.23", None), + }), + ("1.19.4", "v1_19_4", "mojmap", { + "1.19.4": ("45.4.5", None), + }), + ("1.20.1", "v1_20", "mojmap", { + "1.20": ("46.0.14", None), + "1.20.1": ("47.4.26", "1.20.1-47.1.106"), + }), + ("1.20.4", "v1_20", "mojmap", { + "1.20.2": ("48.1.0", "20.2.93"), + "1.20.3": ("49.0.2", "20.3.8-beta"), + "1.20.4": ("49.2.11", "20.4.251"), + }), + ("1.20.6", "v1_20_5", "mojmap", { + "1.20.5": (None, "20.5.21-beta"), + "1.20.6": ("50.2.12", "20.6.141"), + }), + ("1.21.1", "v1_21", "mojmap", { + "1.21": ("51.0.33", "21.0.167"), + "1.21.1": ("52.1.18", "21.1.259"), + }), + # 1.21.4 でアイテムのモデルの仕組みが変わったため、1.21.2 - 1.21.3 とは別にビルドする + ("1.21.3", "v1_21_2", "mojmap", { + "1.21.2": (None, "21.2.1-beta"), + "1.21.3": ("53.1.14", "21.3.97"), + }), + ("1.21.4", "v1_21_4", "mojmap", { + "1.21.4": ("54.1.20", "21.4.158"), + }), + ("1.21.5", "v1_21_5", "mojmap", { + "1.21.5": ("55.1.16", "21.5.98"), + }), + ("1.21.8", "v1_21_6", "mojmap", { + "1.21.6": ("56.0.9", "21.6.20-beta"), + "1.21.7": ("57.0.3", "21.7.25-beta"), + "1.21.8": ("58.1.24", "21.8.54"), + }), + ("1.21.10", "v1_21_9", "mojmap", { + "1.21.9": ("59.0.5", "21.9.16-beta"), + "1.21.10": ("60.1.17", "21.10.64"), + }), + ("1.21.11", "v1_21_11", "mojmap", { + "1.21.11": ("61.2.3", "21.11.45"), + }), + ("26.1", "v26_1", "none", {"26.1": ("62.0.9", "26.1.0.19-beta")}), + ("26.1.1", "v26_1", "none", {"26.1.1": ("63.0.2", "26.1.1.15-beta")}), + ("26.1.2", "v26_1", "none", {"26.1.2": ("64.1.4", "26.1.2.116")}), + ("26.2", "v26_2", "none", {"26.2": ("65.1.4", "26.2.0.90")}), + ("26.3", "v26_3", "none", {"26.3": ("66.0.11", "26.3.0.76")}), +] + +# (Minecraft, 世代, MCP のマッピング, Forge, LiteLoader) +LEGACY = [ + ("1.7.10", "v1_7", "12-1.7.10", "10.13.4.1614-1.7.10", "1.7.10_04"), + ("1.8", "v1_8_0", "18-1.8", "11.14.4.1577", "1.8"), + ("1.8.8", "v1_8", "20-1.8.8", "11.15.0.1655", None), + ("1.8.9", "v1_8", "22-1.8.9", "11.15.1.2318-1.8.9", "1.8.9-SNAPSHOT"), + ("1.9", "v1_9", "24-1.9", "12.16.1.1938-1.9.0", "1.9-SNAPSHOT"), + ("1.9.4", "v1_9", "26-1.9.4", "12.17.0.2317-1.9.4", "1.9.4-SNAPSHOT"), + ("1.10", "v1_10", "29-1.10.2", "12.18.0.2000-1.10.0", "1.10-SNAPSHOT"), + ("1.10.2", "v1_10", "29-1.10.2", "12.18.3.2511", "1.10.2-SNAPSHOT"), + ("1.11", "v1_11", "32-1.11", "13.19.1.2199", "1.11-SNAPSHOT"), + ("1.11.2", "v1_11", "32-1.11", "13.20.1.2588", "1.11.2-SNAPSHOT"), + ("1.12", "v1_12", "39-1.12", "14.21.1.2443", "1.12-SNAPSHOT"), + ("1.12.1", "v1_12", "39-1.12", "14.22.1.2485", "1.12.1-SNAPSHOT"), + ("1.12.2", "v1_12", "39-1.12", "14.23.5.2860", "1.12.2-SNAPSHOT"), +] + + +def target_name(minecraft): + return "mc" + minecraft.replace(".", "_") + + +def build(): + targets = [] + for minecraft, era, mcp, forge, liteloader in LEGACY: + loaders = {} + if forge: + loaders["forge"] = {"loader": forge, "versions": [minecraft]} + if liteloader: + loaders["liteloader"] = {"loader": liteloader} + targets.append({ + "name": target_name(minecraft), "era": era, "minecraft": minecraft, + "mappings": f"mcp:stable:{mcp}", "loaders": loaders, + }) + for minecraft, era, mappings, served in MODERN: + versions = list(served) + loaders = {"fabric": {"loader": FABRIC_LOADER, "versions": versions}} + forge = {version: pair[0] for version, pair in served.items() if pair[0]} + if forge: + loaders["forge"] = {"loader": forge[minecraft], "versions": list(forge), "launch": forge} + if minecraft in FORGE_STUBS: + loaders["forge"]["stubs"] = FORGE_STUBS[minecraft] + # NeoForge 1.20.1 は Forge と互換で、Forge 用の実装がそのまま動く。専用のビルドは作らず、確認だけ行う + compatible = {version: pair[1] for version, pair in served.items() if pair[1] and pair[1].startswith("1.20.1-")} + if compatible: + loaders["forge"]["neoforge_launch"] = compatible + neoforge = {version: pair[1] for version, pair in served.items() if pair[1] and version not in compatible} + if neoforge: + # ビルドツールにはビルド番号だけを、ランチャーには完全なバージョンを渡す + loaders["neoforge"] = {"loader": neoforge[minecraft].rsplit(".", 1)[1], "versions": list(neoforge), + "launch": neoforge} + targets.append({ + "name": target_name(minecraft), "era": era, "minecraft": minecraft, + "mappings": mappings, "loaders": loaders, + }) + return {"eras": ERAS, "targets": targets} + + +def main(): + table = build() + # 1 つの項目を 1 行にして、差分を読みやすくする + lines = ["{", ' "eras": {'] + eras = list(table["eras"].items()) + for index, (name, era) in enumerate(eras): + comma = "," if index < len(eras) - 1 else "" + lines.append(f" {json.dumps(name)}: {json.dumps(era)}{comma}") + lines += [" },", ' "targets": ['] + for index, target in enumerate(table["targets"]): + comma = "," if index < len(table["targets"]) - 1 else "" + lines.append(f" {json.dumps(target)}{comma}") + lines += [" ]", "}"] + (REPO / "targets.json").write_text("\n".join(lines) + "\n", encoding="utf-8") + print(f"Wrote targets.json ({len(table['targets'])} targets)") + + +if __name__ == "__main__": + main() diff --git a/tools/verify/forge_install_fix.py b/tools/verify/forge_install_fix.py new file mode 100644 index 00000000..0e0d40c7 --- /dev/null +++ b/tools/verify/forge_install_fix.py @@ -0,0 +1,48 @@ +"""古い Forge (Minecraft 1.14.2 / 1.14.3 用) を、ランチャー (portablemc) でインストールできるようにする。 + + python forge_install_fix.py <新しめの Java 8 の java> + +そのままでは、インストールの後処理が次の 2 点で失敗する。 + +- ランチャーが使う古い Java (8u51) では、圧縮の結果が Forge の想定と違い、チェックサムが合わない +- 後処理の 1 つが、Minecraft 本体の jar の隣にあるバージョン情報を読むが、ランチャーが渡す jar の隣には + Forge 用のバージョン情報があり、その書き方を読めない + +後処理を起動するところだけを差し替えて、これらを避ける。 +""" + +import shutil +import subprocess +import sys +import types +from pathlib import Path + +import portablemc.forge as forge +from portablemc.cli import main + +JAVA = sys.argv[1] +real_run = subprocess.run + + +def run(args, *positional, **keywords): + args = list(args) + args[0] = JAVA + if "--mc" in args and "DEOBF_REALMS" in args: + # Forge 用のフォルダにある jar の代わりに、バニラのフォルダにある jar を渡す (中身は同じ) + index = args.index("--mc") + 1 + forge_jar = Path(args[index]) + minecraft = forge_jar.parent.name.split("-")[1] + vanilla_jar = forge_jar.parent.parent / minecraft / f"{minecraft}.jar" + if not vanilla_jar.is_file(): + shutil.copyfile(forge_jar, vanilla_jar) + args[index] = str(vanilla_jar) + return real_run(args, *positional, **keywords) + + +shim = types.ModuleType("subprocess") +shim.__dict__.update(vars(subprocess)) +shim.run = run +forge.subprocess = shim + +if __name__ == "__main__": + main(sys.argv[2:]) diff --git a/tools/verify/known-noise.txt b/tools/verify/known-noise.txt new file mode 100644 index 00000000..55b4b05e --- /dev/null +++ b/tools/verify/known-noise.txt @@ -0,0 +1,37 @@ +# Mod を入れていなくても Minecraft 本体やローダーが出す、警告・エラー扱いの行。 +# 基準 (Mod なしでの起動) との差分で大半は除外できるが、基準側では通らない経路 +# (ゲームの正常終了など) で出るものだけをここに書く。 +# 1 行に 1 つの正規表現。なぜ Mod 由来でないと言えるのかを必ず添えること。 + +# Minecraft 1.12.2 以前: サウンドライブラリが終了時に必ず WARN で出す署名 +Author: Paul Lamb, www\.paulscode\.com + +# 検証ではクライアントを一方的に終了させるため、サーバー側に切断の例外が記録される (INFO) +lost connection: .*Internal Exception: java\.io\.IOException +# 確認の途中で、スクリプトがプレイヤーを離れた場所へ移動させるために出る +moved too quickly + +# シェーダーパックを読み込むときに影 Mod が出す、パックの内容についての知らせ (毎回違う関数の名前が出る) +Removing unused function \w+ and omitting further such messages + +# サーバーの処理が遅れたときに、サーバー自身が出す知らせ (確認用の PC が他の処理で忙しいと出る) +Can't keep up! Is the server overloaded\? +# Forge 1.14 - 1.15 が、初回の起動で設定ファイルを書き直したことを自分で検知して出す (出る時点が起動ごとに違う) +Forge config just got changed on the file system! + +# 古いバージョンのサーバーが、終了の途中でログのファイルを閉じたあとに書こうとして出す (Mod はサーバーに入っていない) +An exception occurred processing Appender File +Error writing to RandomAccessFile logs/latest\.log +java\.io\.IOException: Stream Closed +Exception in thread "Server Shutdown Thread" + +# 確認用のアカウントは実在しないので、Minecraft 自体がスキンの情報を取りに行って失敗することがある (通信の状況によって出たり出なかったりする) +Couldn't look up profile properties for +MinecraftClientHttpException + +# 影 Mod がシェーダーパックを組み立てるときに出す、パックの内容についての知らせ。 +# ワールドに入ったときに出るので、ワールドに入れない基準の取得 (起動が済んでから接続するバージョン) では基準に入らない +\] Unsupported uniform: +Failed to resolve uniform +The following uniforms won't work +Error while parsing the block ID map entry diff --git a/tools/verify/make_test_image.py b/tools/verify/make_test_image.py new file mode 100644 index 00000000..030d3613 --- /dev/null +++ b/tools/verify/make_test_image.py @@ -0,0 +1,21 @@ +"""動作確認で看板に貼る画像を作る。4 色の領域と中央の円で、向きや反転が見て分かるようにしている。""" + +from pathlib import Path + +from PIL import Image, ImageDraw + +WIDTH, HEIGHT = 320, 200 +COLORS = [(230, 60, 60, 255), (60, 180, 75, 255), (60, 110, 230, 255), (250, 200, 40, 255)] + +image = Image.new("RGBA", (WIDTH, HEIGHT), (0, 0, 0, 0)) +draw = ImageDraw.Draw(image) +for index, color in enumerate(COLORS): + x, y = (index % 2) * WIDTH // 2, (index // 2) * HEIGHT // 2 + draw.rectangle([x, y, x + WIDTH // 2 - 1, y + HEIGHT // 2 - 1], fill=color) +draw.ellipse([WIDTH // 2 - 50, HEIGHT // 2 - 50, WIDTH // 2 + 50, HEIGHT // 2 + 50], + fill=(255, 255, 255, 255), outline=(0, 0, 0, 255), width=4) +draw.text((WIDTH // 2 - 12, HEIGHT // 2 - 6), "TEST", fill=(0, 0, 0, 255)) + +output = Path(__file__).with_name("test-image.png") +image.save(output) +print(f"Wrote {output}") diff --git a/tools/verify/make_test_model.py b/tools/verify/make_test_model.py new file mode 100644 index 00000000..deb079cb --- /dev/null +++ b/tools/verify/make_test_model.py @@ -0,0 +1,125 @@ +"""実機検証用の 3D モデル (test-model.glb) を作る。 + +正面にテスト画像を貼った薄い箱で、陰影を付けない材質にしてある。 +画像の看板と同じ見え方になるので、スクリーンショットの判定をそのまま使える。 +ノードの階層、拡大、回転、平行移動を通しても正しい位置と向きになることも確かめられる。 + + python tools/verify/make_test_model.py +""" + +import json +import struct +from pathlib import Path + +HERE = Path(__file__).resolve().parent + +WIDTH, HEIGHT, DEPTH = 1.6, 1.0, 0.08 + + +def box(): + """(位置, 法線, テクスチャ座標, 頂点番号) を、正面とそれ以外に分けて返す。""" + x, y, z = WIDTH / 2, HEIGHT / 2, DEPTH / 2 + faces = [ + # 法線, 4 つの角 (外から見て反時計回り) + ((0, 0, 1), [(-x, -y, z), (x, -y, z), (x, y, z), (-x, y, z)]), + ((0, 0, -1), [(x, -y, -z), (-x, -y, -z), (-x, y, -z), (x, y, -z)]), + ((1, 0, 0), [(x, -y, z), (x, -y, -z), (x, y, -z), (x, y, z)]), + ((-1, 0, 0), [(-x, -y, -z), (-x, -y, z), (-x, y, z), (-x, y, -z)]), + ((0, 1, 0), [(-x, y, z), (x, y, z), (x, y, -z), (-x, y, -z)]), + ((0, -1, 0), [(-x, -y, -z), (x, -y, -z), (x, -y, z), (-x, -y, z)]), + ] + uv = [(0, 1), (1, 1), (1, 0), (0, 0)] + front = ([], [], [], []) + rest = ([], [], [], []) + for index, (normal, corners) in enumerate(faces): + positions, normals, coords, indices = front if index == 0 else rest + base = len(positions) + for corner, coord in zip(corners, uv): + positions.append(corner) + normals.append(normal) + coords.append(coord) + indices += [base, base + 1, base + 2, base, base + 2, base + 3] + return front, rest + + +def main(): + image = (HERE / "test-image.png").read_bytes() + binary = bytearray() + views = [] + accessors = [] + + def view(data, target=None): + while len(binary) % 4: + binary.append(0) + entry = {"buffer": 0, "byteOffset": len(binary), "byteLength": len(data)} + if target is not None: + entry["target"] = target + binary.extend(data) + views.append(entry) + return len(views) - 1 + + def accessor(values, kind, component, fmt, target, bounds=False): + flat = [value for item in values for value in (item if isinstance(item, tuple) else (item,))] + entry = {"bufferView": view(struct.pack(f"<{len(flat)}{fmt}", *flat), target), + "componentType": component, "count": len(values), "type": kind} + if bounds: + entry["min"] = [min(item[axis] for item in values) for axis in range(3)] + entry["max"] = [max(item[axis] for item in values) for axis in range(3)] + accessors.append(entry) + return len(accessors) - 1 + + primitives = [] + for material, (positions, normals, coords, indices) in enumerate(box()): + primitives.append({ + "attributes": { + "POSITION": accessor(positions, "VEC3", 5126, "f", 34962, True), + "NORMAL": accessor(normals, "VEC3", 5126, "f", 34962), + "TEXCOORD_0": accessor(coords, "VEC2", 5126, "f", 34962), + }, + "indices": accessor(indices, "SCALAR", 5123, "H", 34963), + "material": material, + }) + image_view = view(image) + binary.extend(b"\0" * (-len(binary) % 4)) + + unlit = {"KHR_materials_unlit": {}} + document = { + "asset": {"version": "2.0", "generator": "MarumaSign make_test_model.py"}, + "extensionsUsed": ["KHR_materials_unlit"], + "scene": 0, + "scenes": [{"nodes": [0]}], + # 親で 2 倍に拡大して縦軸で 90 度回し、子で元に戻す。子は少しずらしてある + "nodes": [ + {"name": "root", "children": [1], "scale": [2, 2, 2], "rotation": [0, 0.70710678, 0, 0.70710678]}, + {"name": "panel", "mesh": 0, "rotation": [0, -0.70710678, 0, 0.70710678], "translation": [3, 1, -2]}, + ], + "meshes": [{"name": "panel", "primitives": primitives}], + "materials": [ + {"name": "picture", "pbrMetallicRoughness": {"baseColorTexture": {"index": 0}, "metallicFactor": 0}, + "extensions": unlit}, + {"name": "frame", "pbrMetallicRoughness": {"baseColorFactor": [0.2, 0.2, 0.2, 1], "metallicFactor": 0}, + "extensions": unlit}, + ], + "textures": [{"source": 0, "sampler": 0}], + "samplers": [{"wrapS": 33071, "wrapT": 33071}], + "images": [{"bufferView": image_view, "mimeType": "image/png"}], + "accessors": accessors, + "bufferViews": views, + "buffers": [{"byteLength": len(binary)}], + } + + text = json.dumps(document, separators=(",", ":")).encode("utf-8") + text += b" " * (-len(text) % 4) + total = 12 + 8 + len(text) + 8 + len(binary) + output = HERE / "test-model.glb" + with output.open("wb") as file: + file.write(struct.pack(" <ポート> +""" + +import http.server +import os +import re +import sys +from pathlib import Path + + +def make_handler(directory): + root = Path(directory).resolve() + + class Handler(http.server.BaseHTTPRequestHandler): + protocol_version = "HTTP/1.1" + + def log_message(self, *args): + pass + + def do_HEAD(self): + self._serve(False) + + def do_GET(self): + self._serve(True) + + def _serve(self, with_body): + path = (root / self.path.split("?", 1)[0].lstrip("/")).resolve() + if root not in path.parents or not path.is_file(): + self.send_response(404) + self.send_header("Content-Length", "0") + self.end_headers() + return + size = path.stat().st_size + start, end = 0, size - 1 + match = re.match(r"bytes=(\d*)-(\d*)$", self.headers.get("Range", "")) + if match and (match.group(1) or match.group(2)): + if match.group(1): + start = int(match.group(1)) + if match.group(2): + end = min(end, int(match.group(2))) + else: + # 末尾からのバイト数での指定 + start = max(0, size - int(match.group(2))) + if start > end: + self.send_response(416) + self.send_header("Content-Range", f"bytes */{size}") + self.send_header("Content-Length", "0") + self.end_headers() + return + self.send_response(206) + self.send_header("Content-Range", f"bytes {start}-{end}/{size}") + else: + self.send_response(200) + self.send_header("Accept-Ranges", "bytes") + self.send_header("Content-Type", "application/octet-stream") + self.send_header("Content-Length", str(end - start + 1)) + self.end_headers() + if not with_body: + return + try: + with open(path, "rb") as source: + source.seek(start) + remaining = end - start + 1 + while remaining > 0: + chunk = source.read(min(65536, remaining)) + if not chunk: + break + self.wfile.write(chunk) + remaining -= len(chunk) + except (ConnectionError, OSError): + # 読み手が途中で接続を閉じた + pass + + return Handler + + +def main(): + directory = sys.argv[1] if len(sys.argv) > 1 else os.getcwd() + port = int(sys.argv[2]) if len(sys.argv) > 2 else 18999 + server = http.server.ThreadingHTTPServer(("127.0.0.1", port), make_handler(directory)) + print(f"Serving {directory} on http://127.0.0.1:{port}/", flush=True) + server.serve_forever() + + +if __name__ == "__main__": + main() diff --git a/tools/verify/recheck.py b/tools/verify/recheck.py new file mode 100644 index 00000000..1528a3cb --- /dev/null +++ b/tools/verify/recheck.py @@ -0,0 +1,24 @@ +"""保存済みのスクリーンショットを判定し直す。判定方法を変えたあとの確認に使う。 + + python tools/verify/recheck.py [組み合わせ ...] # 例: fabric-26.1 forge-1.12.2 +""" + +import sys + +import verify + + +def main(): + runs = verify.DEFAULT_ROOT / "runs" + names = sys.argv[1:] or sorted(path.name for path in runs.iterdir() if (path / "screenshot.png").is_file()) + for name in names: + screenshot = runs / name / "screenshot.png" + if not screenshot.is_file(): + print(f"{name:<28} (no screenshot)") + continue + visible, detail = verify.analyze_screenshot(screenshot) + print(f"{name:<28} {'OK' if visible else 'NO':<3} {detail}") + + +if __name__ == "__main__": + main() diff --git a/tools/verify/report.py b/tools/verify/report.py new file mode 100644 index 00000000..c978ae2a --- /dev/null +++ b/tools/verify/report.py @@ -0,0 +1,141 @@ +"""実機での動作確認の結果 (matrix.py が保存したもの) から docs/verification.md を作る。 + + python tools/verify/report.py +""" + +import datetime +import json +import re +from pathlib import Path + +import matrix +import verify + +REPO = Path(__file__).resolve().parents[2] +LOADERS = ["fabric", "forge", "neoforge", "liteloader"] +LOADER_NAMES = {"fabric": "Fabric", "forge": "Forge", "neoforge": "NeoForge", "liteloader": "LiteLoader"} + + +def version_key(version): + return tuple(int(part) for part in re.findall(r"\d+", version)) + + +MEDIA_NAMES = {"image": "画像", "model": "3D モデル", "video": "動画"} +# シェーダーパックの、表に書く名前 +PACK_NAMES = { + "bsl-shaders": "BSL", + "complementary-reimagined": "Complementary Reimagined", + "complementary-unbound": "Complementary Unbound", + "sildurs-vibrant-shaders": "Sildur's Vibrant", + "makeup-ultra-fast-shaders": "MakeUp Ultra Fast", + "photon-shader": "Photon", +} + + +def cell(entry, digest): + # 別のビルドで確認した結果は、いまのファイルの結果としては数えない + if entry is None or entry.get("mod_sha256") != digest: + return "" + if entry.get("baseline_failed"): + # Mod を入れなくても起動しなかった。Mod の結果ではない + return "対象外" + if entry.get("clean"): + missing = [name for kind, name in MEDIA_NAMES.items() if kind not in entry.get("media", [])] + return "OK" if not missing else "OK (" + "・".join(missing) + "は未確認)" + if entry.get("ok"): + # 動作はしたが、基準にない警告が出たか、表示を確認できなかった + return "要確認" + return "失敗" + + +def main(): + summary_file = verify.DEFAULT_ROOT / "summary.json" + summary = json.loads(summary_file.read_text(encoding="utf-8")) if summary_file.is_file() else {} + + supported = {} + for loader, minecraft, _, mod in matrix.combinations(REPO / "dist" / "build" / "libs"): + supported.setdefault(minecraft, set()).add(loader) + supported.setdefault((minecraft, loader), + matrix.combination_digest(mod, loader, minecraft) if mod.is_file() else None) + + lines = [ + "# 動作確認の結果", + "", + "`tools/verify/matrix.py` による実機確認の結果です。このファイルは `tools/verify/report.py` が生成します。", + "", + "確認の内容: バニラのサーバーを起動し、各ローダーを入れた実際のクライアントで接続して、", + "サバイバルモードのまま、ゲーム内のウィンドウでファイルを選び、看板を設置して表示されるまでを自動で行います。", + "1 回の起動で、画像 (PNG)、3D モデル (GLB)、動画 (音声付きの MP4) の 3 つを順に確認し、", + "最後に、看板の文字をデータとして持たせた看板アイテムを渡して、手持ちの枠の中の見た目がその画像になることを確認します。", + "", + "- **OK**: 3 つとも正しい向きで表示され、看板そのものは隠れていて、看板アイテムも画像の見た目になり、", + " Mod を入れていない状態と比べて新しい警告やエラーが出なかった", + "- **要確認**: 動作はしたが、新しい警告が出たか、表示を確認できなかった", + "- **失敗**: 動作しなかった", + "- **対象外**: Mod を入れていない状態でもゲームが起動しないか、サーバーに入れなかった (ローダーや影 Mod 側の問題)", + "- 空欄: そのローダーはこのバージョンに対応していない", + "- **未確認**: 対応しているが、配布するファイルの現在の内容ではまだ確認していない", + "", + f"Mod のバージョン: {matrix.mod_version()} / 作成日: {datetime.date.today().isoformat()}", + "", + "| Minecraft | " + " | ".join(LOADER_NAMES[loader] for loader in LOADERS) + " |", + "| --- | " + " | ".join("---" for _ in LOADERS) + " |", + ] + counts = {"OK": 0, "要確認": 0, "失敗": 0, "対象外": 0, "未確認": 0} + for minecraft in sorted((key for key in supported if isinstance(key, str)), key=version_key, reverse=True): + cells = [] + for loader in LOADERS: + if loader not in supported[minecraft]: + cells.append("") + continue + text = cell(summary.get(f"{loader}:{minecraft}"), supported[(minecraft, loader)]) or "未確認" + counts[text.split(" ")[0]] += 1 + cells.append(text) + lines.append(f"| {minecraft} | " + " | ".join(cells) + " |") + lines += ["", "合計: " + "、".join(f"{name} {count}" for name, count in counts.items() if count), ""] + + # 影 Mod を入れた状態での確認 + shader_rows = [] + for minecraft in sorted((key for key in supported if isinstance(key, str)), key=version_key, reverse=True): + cells = [] + for loader in LOADERS: + # シェーダーパックごとの結果を、1 つのマスにまとめる + prefix = f"{loader}:{minecraft}+shaders" + parts = [] + for key in sorted(key for key in summary if key == prefix or key.startswith(prefix + ":")): + entry = summary[key] + text = cell(entry, supported.get((minecraft, loader))) if loader in supported[minecraft] else "" + if not text: + continue + pack = entry.get("shader_pack") or "bsl-shaders" + parts.append(f"{entry.get('shader_mod') or '?'} + {PACK_NAMES.get(pack, pack)}: {text}") + cells.append("
".join(parts)) + if any(cells): + shader_rows.append(f"| {minecraft} | " + " | ".join(cells) + " |") + if shader_rows: + lines += [ + "## 影 Mod を入れた状態", + "", + "影 Mod (シェーダーを使えるようにする Mod) とシェーダーパックを入れて、同じ確認を行った結果です。", + "マスの中は「影 Mod + シェーダーパック: 結果」です。", + "Iris は Sodium と、Oculus は Rubidium または Embeddium と一緒に入れています。空欄は、確認していない組み合わせです。", + "シェーダーは絵にも影や空の色を付けるので、色そのものではなく、絵が正しい場所に正しい向きで写っていることを確認しています。", + "", + "次の組み合わせは、この Mod を入れなくても影 Mod が動かないため、確認の対象から外しています。", + "", + "- Forge 1.21.1 + OptiFine 1.21.1 HD U J1: OptiFine の読み込み中にゲームが終了する", + "- Forge 1.14.2 + OptiFine 1.14.2 HD U F1: ゲームが起動しない", + "- OptiFine 1.8.9 + MakeUp Ultra Fast: 画面が真っ黒になる", + "", + "| Minecraft | " + " | ".join(LOADER_NAMES[loader] for loader in LOADERS) + " |", + "| --- | " + " | ".join("---" for _ in LOADERS) + " |", + ] + shader_rows + [""] + + output = REPO / "docs" / "verification.md" + output.parent.mkdir(parents=True, exist_ok=True) + output.write_text("\n".join(lines), encoding="utf-8", newline="\n") + print(f"Wrote {output}: {counts}") + + +if __name__ == "__main__": + main() diff --git a/tools/verify/shadermods.py b/tools/verify/shadermods.py new file mode 100644 index 00000000..2006062f --- /dev/null +++ b/tools/verify/shadermods.py @@ -0,0 +1,292 @@ +"""影 Mod (シェーダーを使えるようにする Mod) を入れた状態で確認するための準備。 + +ローダーと Minecraft のバージョンに合う影 Mod と、それが必要とする Mod、シェーダーパックを取得して、 +起動フォルダに置き、シェーダーを有効にする設定を書く。 + +- Fabric: Iris (と Sodium) +- NeoForge: Iris (と Sodium) +- Forge 1.16.5 以降: Oculus (と Rubidium / Embeddium) +- Forge 1.7.10 - 1.15.2: OptiFine +- LiteLoader: OptiFine (Mod としてではなく、起動用のプロファイルに組み込む) +""" + +import json +import re +import shutil +import urllib.parse +import urllib.request +import zipfile +from pathlib import Path + +MODRINTH = "https://api.modrinth.com/v2" +# OptiFine は公式サイトから機械的には取得できないため、ランチャーが使っているミラーから取得する +OPTIFINE = "https://bmclapi2.bangbang93.com/optifine" +USER_AGENT = "MarumaSign-verify/1.0 (local testing)" + +# シェーダーパック。古い OptiFine から新しい Iris まで、幅広いバージョンで動くもの +SHADER_PACK = "bsl-shaders" + +# シェーダーが有効になったことを示すログの行 +ACTIVE_PATTERNS = [ + re.compile(r"Using shaderpack: "), # Iris / Oculus + re.compile(r"\[Shaders\] Loaded shaderpack: "), # OptiFine + re.compile(r"Loaded shaderpack: "), +] + + +def version_key(version): + return tuple(int(part) for part in re.findall(r"\d+", version)) + + +def fetch_json(url): + request = urllib.request.Request(url, headers={"User-Agent": USER_AGENT}) + with urllib.request.urlopen(request, timeout=60) as response: + return json.load(response) + + +def download(url, path): + if path.is_file() and path.stat().st_size > 0: + return + path.parent.mkdir(parents=True, exist_ok=True) + request = urllib.request.Request(url, headers={"User-Agent": USER_AGENT}) + temporary = path.with_suffix(path.suffix + ".part") + with urllib.request.urlopen(request, timeout=300) as response, temporary.open("wb") as file: + shutil.copyfileobj(response, file) + temporary.replace(path) + + +def modrinth_version(project, loader, minecraft): + """プロジェクトの、指定したローダーとバージョン向けの最新版。なければ None。""" + query = urllib.parse.urlencode({"loaders": json.dumps([loader]), "game_versions": json.dumps([minecraft])}) + versions = fetch_json(f"{MODRINTH}/project/{project}/version?{query}") + if not versions: + return None + # 正式版があればそれを、なければ最新のものを使う + releases = [version for version in versions if version.get("version_type") == "release"] + return (releases or versions)[0] + + +def numbers(text): + """バージョンの文字列の先頭にある数字の並び。比較に使う。""" + match = re.match(r"(?:mc[\d.]+-)?v?(\d+(?:\.\d+)*)", text.strip()) + return tuple(int(part) for part in match.group(1).split(".")) if match else () + + +def satisfies(version, spec): + """Fabric の書き方 (">=0.6.9" や "0.5.x" など) で指定された条件に合うかどうか。""" + for part in spec.split(): + operator = re.match(r"[<>=~^]*", part).group(0) + wanted = part[len(operator):] + if wanted in ("*", ""): + continue + prefix = numbers(wanted.replace(".x", "").replace(".*", "")) + if "x" in wanted or "*" in wanted or operator in ("~", "^"): + # 先頭の数字が同じで、指定以上のもの + fixed = prefix[:-1] if operator in ("~", "^") and len(prefix) > 1 else prefix + if version[:len(fixed)] != fixed or (operator in ("~", "^") and version < prefix): + return False + elif operator == ">=" and version < prefix or operator == ">" and version <= prefix: + return False + elif operator == "<=" and version > prefix or operator == "<" and version >= prefix: + return False + elif operator in ("", "=") and version[:len(prefix)] != prefix: + return False + return True + + +def in_range(version, spec): + """Forge / NeoForge の書き方 ("[0.3.1,)" など) で指定された範囲に入るかどうか。""" + match = re.match(r"\s*([\[\(])([^,\]\)]*),?([^\]\)]*)([\]\)])\s*$", spec) + if not match: + prefix = numbers(spec) + return not prefix or version[:len(prefix)] == prefix + low, high = numbers(match.group(2)), numbers(match.group(3)) + if "," not in spec: + return version[:len(low)] == low + if low and (version < low or (match.group(1) == "(" and version == low)): + return False + if high and (version > high or (match.group(4) == ")" and version >= high)): + return False + return True + + +def declared_requirements(jar): + """Mod の jar が、必要とする Mod について指定しているバージョンの条件。{Mod の ID: 判定する関数}""" + found = {} + try: + with zipfile.ZipFile(jar) as archive: + names = set(archive.namelist()) + if "fabric.mod.json" in names: + depends = json.loads(archive.read("fabric.mod.json").decode("utf-8")).get("depends", {}) + for mod, value in depends.items(): + specs = [str(item) for item in (value if isinstance(value, list) else [value])] + found[mod] = lambda version, specs=specs: any(satisfies(version, spec) for spec in specs) + for name in ("META-INF/neoforge.mods.toml", "META-INF/mods.toml"): + if name in names: + text = archive.read(name).decode("utf-8", errors="replace") + for mod, spec in re.findall(r'modId\s*=\s*"([^"]+)"[^\[]*?versionRange\s*=\s*"([^"]*)"', text): + found[mod] = lambda version, spec=spec: in_range(version, spec) + except (OSError, ValueError, zipfile.BadZipFile): + pass + return found + + +def matching_version(project, loader, minecraft, requirements): + """jar の中の指定に合う、最も新しい版。指定がないか、合うものがなければ None。""" + slug = fetch_json(f"{MODRINTH}/project/{project}").get("slug", "") + accepts = requirements.get(slug) + if accepts is None: + return None + query = urllib.parse.urlencode({"loaders": json.dumps([loader]), "game_versions": json.dumps([minecraft])}) + versions = fetch_json(f"{MODRINTH}/project/{project}/version?{query}") + matching = [version for version in versions if accepts(numbers(version.get("version_number", "")))] + releases = [version for version in matching if version.get("version_type") == "release"] + return (releases or matching or [None])[0] + +def modrinth_files(project, loader, minecraft, seen, cache_dir, version=None): + """Mod と、それが必要とする Mod のファイル (名前, URL) を集める。""" + if version is None: + version = modrinth_version(project, loader, minecraft) + if version is None: + return None + files = [] + primary = next((file for file in version["files"] if file.get("primary")), version["files"][0]) + files.append((primary["filename"], primary["url"])) + # 必要とする Mod の版は、jar の中の指定に合わせる (最新版同士だと合わないことがある) + download(primary["url"], cache_dir / primary["filename"]) + requirements = declared_requirements(cache_dir / primary["filename"]) + for dependency in version.get("dependencies", []): + target = dependency.get("project_id") + if dependency.get("dependency_type") != "required" or not target or target in seen: + continue + seen.add(target) + if dependency.get("version_id"): + chosen = fetch_json(f"{MODRINTH}/version/{dependency['version_id']}") + if minecraft not in chosen.get("game_versions", []) \ + and fetch_json(f"{MODRINTH}/project/{target}").get("slug", "") not in requirements: + # 指定された版が、このバージョンの Minecraft 向けでないことがある + # (Oculus 1.19-1.2.5a は 1.19.2 向けの Rubidium 0.6.2b を指定していて、1.19 / 1.19.1 では Mod なしでも落ちる)。 + # jar の中に版の条件も書かれていなければ、このバージョン向けの最新版を使う + chosen = modrinth_version(target, loader, minecraft) or chosen + else: + chosen = matching_version(target, loader, minecraft, requirements) + required = modrinth_files(target, loader, minecraft, seen, cache_dir, chosen) + if required is None: + return None + files += required + return files + + +def optifine_file(minecraft): + """Forge と一緒に使える OptiFine。なければ None。""" + try: + entries = fetch_json(f"{OPTIFINE}/{minecraft}") + except OSError: + return None + # 試験版でないもののうち、最も新しいもの + stable = [entry for entry in entries if not entry.get("filename", "").startswith("preview")] + if not stable: + return None + entry = stable[-1] + return entry["filename"], f"{OPTIFINE}/{minecraft}/{entry['type']}/{entry['patch']}" + + +def pack_version(pack, loader, minecraft): + """シェーダーパックの、指定したバージョン向けの最新版。その表記がなければ、パックの最新版。""" + version = modrinth_version(pack, loader, minecraft) + if version is None: + # シェーダーパックは Minecraft のバージョンにあまり依存しないので、対応表にないだけのことが多い + query = urllib.parse.urlencode({"loaders": json.dumps([loader])}) + versions = fetch_json(f"{MODRINTH}/project/{pack}/version?{query}") + releases = [item for item in versions if item.get("version_type") == "release"] + version = (releases or versions or [None])[0] + return version + + +def variant(pack_slug=None, shader_mod=None): + """既定と違う構成で確認するときに、結果の名前に付ける文字列。既定どおりなら空。""" + parts = [shader_mod or "", "" if (pack_slug or SHADER_PACK) == SHADER_PACK else pack_slug] + return "-".join(part for part in parts if part) + + +def resolve(loader, minecraft, cache_dir, pack_slug=SHADER_PACK, shader_mod=None): + """影 Mod の構成を返す。この組み合わせで使える影 Mod がなければ None。 + + shader_mod に "optifine" を指定すると、Forge 1.16.5 以降でも OptiFine を使う。 + + 戻り値: {"name": 影 Mod の名前, "mods": [(ファイル名, URL)], "config": 設定ファイルの名前, "pack": (ファイル名, URL)} + """ + library = None + try: + if shader_mod == "optifine" and loader not in ("forge", "liteloader"): + return None + if loader in ("fabric", "neoforge"): + mods = modrinth_files("iris", loader, minecraft, {"iris"}, cache_dir) + name, config = "Iris", "config/iris.properties" + elif loader == "forge" and version_key(minecraft) >= (1, 16, 5) and shader_mod != "optifine": + mods = modrinth_files("oculus", loader, minecraft, {"oculus"}, cache_dir) + name, config = "Oculus", "config/oculus.properties" + elif loader == "forge": + optifine = optifine_file(minecraft) + mods = [optifine] if optifine else None + name, config = "OptiFine", "optionsshaders.txt" + elif loader == "liteloader": + # LiteLoader には OptiFine を Mod として読み込む仕組みがないので、起動用のプロファイルに組み込む + optifine = optifine_file(minecraft) + if optifine is None: + return None + download(optifine[1], cache_dir / optifine[0]) + mods, library = [], cache_dir / optifine[0] + name, config = "OptiFine", "optionsshaders.txt" + else: + return None + if not mods and library is None: + return None + pack = pack_version(pack_slug, "optifine" if name == "OptiFine" else "iris", minecraft) + if pack is None: + return None + return {"name": name, "mods": mods, "config": config, "pack_slug": pack_slug, "library": library, + "pack": (pack["files"][0]["filename"], pack["files"][0]["url"])} + except OSError: + return None + + +def install(setup, cache_dir, work_dir): + """影 Mod とシェーダーパックを起動フォルダに置き、シェーダーを有効にする。""" + for filename, url in setup["mods"]: + cached = cache_dir / filename + download(url, cached) + shutil.copy2(cached, work_dir / "mods" / filename) + pack_name, pack_url = setup["pack"] + cached = cache_dir / pack_name + download(pack_url, cached) + (work_dir / "shaderpacks").mkdir(exist_ok=True) + shutil.copy2(cached, work_dir / "shaderpacks" / pack_name) + + config = work_dir / setup["config"] + config.parent.mkdir(parents=True, exist_ok=True) + if setup["name"] == "OptiFine": + config.write_text(f"shaderPack={pack_name}\n") + # 一部の版 (1.8.8 など) は「高速レンダリング」が最初から有効で、そのままではシェーダーを読み込まない + (work_dir / "optionsof.txt").write_text("ofFastRender:false\n") + else: + config.write_text(f"enableShaders=true\nshaderPack={pack_name}\n") + + +def is_active(log_text): + """ログから、シェーダーが実際に有効になったかどうかを判定する。""" + return any(pattern.search(log_text) for pattern in ACTIVE_PATTERNS) + + +if __name__ == "__main__": + import sys + + # 引数: loader:version または loader:version:シェーダーパックの名前 または loader:version:シェーダーパックの名前:optifine + for item in sys.argv[1:]: + loader_name, minecraft_version, *rest = item.split(":") + result = resolve(loader_name, minecraft_version, Path.home() / ".marumasign-verify" / "shadermods", *rest) + if result is None: + print(f"{item}: no shader mod") + else: + print(f"{item}: {result['name']} {[name for name, _ in result['mods']] or result['library'].name}" + f" + {result['pack'][0]}") diff --git a/tools/verify/test-image.png b/tools/verify/test-image.png new file mode 100644 index 00000000..12e93490 Binary files /dev/null and b/tools/verify/test-image.png differ diff --git a/tools/verify/test-model.glb b/tools/verify/test-model.glb new file mode 100644 index 00000000..a54bd63e Binary files /dev/null and b/tools/verify/test-model.glb differ diff --git a/tools/verify/test-video.mp4 b/tools/verify/test-video.mp4 new file mode 100644 index 00000000..9584fe17 Binary files /dev/null and b/tools/verify/test-video.mp4 differ diff --git a/tools/verify/verify.py b/tools/verify/verify.py new file mode 100644 index 00000000..e60d541e --- /dev/null +++ b/tools/verify/verify.py @@ -0,0 +1,1126 @@ +"""実機での動作確認を自動で行う。 + +バニラサーバーを起動し、指定したローダーを入れた実際のクライアントで接続して、 +Mod 内蔵のセルフテスト (画面を開く -> 画像を選ぶ -> 看板を設置 -> 描画を確認) を実行する。 +終了後、クライアントとサーバーのログから警告とエラーを集めて結果を JSON で出力する。 + +使い方: + python tools/verify/verify.py --minecraft 1.12.2 --loader forge --loader-version 14.23.5.2860 \ + --mod dist/build/libs/MarumaSign-4.0.0.jar +""" + +import argparse +import http.server +import json +import os +import re +import shutil +import subprocess +import sys +import threading +import time +import urllib.parse +import urllib.request + +import shadermods +from pathlib import Path + +REPO = Path(__file__).resolve().parents[2] +DEFAULT_ROOT = Path(os.environ.get("MARUMASIGN_VERIFY_ROOT", Path.home() / ".marumasign-verify")) +PLAYER = "Tester" +MANIFEST_URL = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" + + +# 一部の配布サーバーは既定の User-Agent を拒否する +_opener = urllib.request.build_opener() +_opener.addheaders = [("User-Agent", "MarumaSign-verify/1.0 (+https://github.com/TORO-Server/MarumaSign)")] +urllib.request.install_opener(_opener) + + +def log(message): + print(f"[verify] {message}", flush=True) + + +def version_key(version): + """バージョン文字列を比較できる形にする ("1.12.2" -> (1, 12, 2)、"1.14" -> (1, 14, 0))。""" + parts = [int(part) for part in re.findall(r"\d+", version)[:3]] + # 桁数をそろえる (そろえないと、"1.14" が (1, 14, 0) より小さいと判定される) + return tuple(parts + [0] * (3 - len(parts))) + + +def fetch_json(url): + with urllib.request.urlopen(url, timeout=60) as response: + return json.load(response) + + +def download(url, path): + path.parent.mkdir(parents=True, exist_ok=True) + temporary = path.with_suffix(path.suffix + ".part") + with urllib.request.urlopen(url, timeout=120) as response, open(temporary, "wb") as output: + shutil.copyfileobj(response, output) + temporary.replace(path) + + +# ---------- 画像のアップロード先と URL 短縮の代わりをするサーバー ---------- + +class MockHost: + def __init__(self): + self.files = {} + self.requests = [] + host = self + + class Handler(http.server.BaseHTTPRequestHandler): + def log_message(self, *args): + pass + + def _send(self, status, body, content_type="text/plain"): + # 動画は途中から読めないと再生できないことがあるので、範囲指定に対応する + total = len(body) + requested = re.match(r"bytes=(\d*)-(\d*)$", self.headers.get("Range", "")) if status == 200 else None + if requested and (requested.group(1) or requested.group(2)): + if requested.group(1): + start = int(requested.group(1)) + end = min(int(requested.group(2)), total - 1) if requested.group(2) else total - 1 + else: + start = max(0, total - int(requested.group(2))) + end = total - 1 + if start > end or start >= total: + self.send_response(416) + self.send_header("Content-Range", f"bytes */{total}") + self.send_header("Content-Length", "0") + self.end_headers() + return + body = body[start:end + 1] + status = 206 + self.send_response(status) + self.send_header("Content-Type", content_type) + self.send_header("Content-Length", str(len(body))) + if status in (200, 206): + self.send_header("Accept-Ranges", "bytes") + if status == 206: + self.send_header("Content-Range", f"bytes {start}-{end}/{total}") + self.end_headers() + try: + self.wfile.write(body) + except (BrokenPipeError, ConnectionError): + # 動画の再生では、読む側が途中で接続を閉じることがある + pass + + def do_POST(self): + body = self.rfile.read(int(self.headers.get("Content-Length", "0"))) + host.requests.append("POST " + self.path) + # multipart の中からファイルの本体を取り出す + boundary = self.headers.get("Content-Type", "").split("boundary=")[-1].encode() + data = b"" + extension = ".png" + for part in body.split(b"--" + boundary): + if b'name="fileToUpload"' in part: + header, content = part.split(b"\r\n\r\n", 1) + data = content.rsplit(b"\r\n", 1)[0] + # 実際のアップロード先と同じように、元のファイルの拡張子を引き継ぐ + filename = re.search(rb'filename="[^"]*?(\.[A-Za-z0-9]{1,5})"', header) + if filename: + extension = filename.group(1).decode().lower() + name = f"{len(host.files) + 1}{extension}" + host.files[name] = data + self._send(200, f"http://127.0.0.1:{host.port}/i/{name}".encode()) + + def do_GET(self): + host.requests.append("GET " + self.path) + parsed = urllib.parse.urlparse(self.path) + if parsed.path.startswith("/i/") or parsed.path.startswith("/s/"): + data = host.files.get(parsed.path[3:]) + if data is None: + self._send(404, b"not found") + else: + self._send(200, data, "application/octet-stream") + elif parsed.path == "/shorten": + target = urllib.parse.parse_qs(parsed.query).get("url", [""])[0] + name = target.rsplit("/", 1)[-1] + self._send(200, f"http://127.0.0.1:{host.port}/s/{name}".encode()) + else: + self._send(404, b"not found") + + self.server = http.server.ThreadingHTTPServer(("127.0.0.1", 0), Handler) + self.port = self.server.server_address[1] + threading.Thread(target=self.server.serve_forever, daemon=True).start() + + def close(self): + self.server.shutdown() + + +# ---------- Java ---------- + +def java_major_for(minecraft): + key = version_key(minecraft) + if key >= (26, 0, 0): + return 25 + if key >= (1, 20, 5): + return 21 + if key >= (1, 17, 0): + return 17 + return 8 + + +def find_java(major, main_dir, bundled=True): + """サーバーの起動に使う java を探す。bundled が False なら、ランチャーがダウンロードしたものは使わない。""" + candidates = [] + # クライアント用にランチャーがダウンロードした Mojang 配布の Java + component = {8: "jre-legacy", 17: "java-runtime-gamma", 21: "java-runtime-delta", 25: "java-runtime-epsilon"}.get(major) + if component and bundled: + candidates += list((main_dir / "jvm").glob(f"{component}/bin/java.exe")) + for base in (Path.home() / ".jdks", Path.home() / ".gradle" / "jdks", Path("C:/Program Files/Java")): + if base.is_dir(): + for java in base.glob("*/bin/java.exe"): + candidates.append(java) + for java in base.glob("*/*/bin/java.exe"): + candidates.append(java) + for java in candidates: + try: + output = subprocess.run([str(java), "-version"], capture_output=True, text=True, timeout=30).stderr + except (OSError, subprocess.SubprocessError): + continue + match = re.search(r'version "(?:1\.)?(\d+)', output) + if match and int(match.group(1)) == major: + return java + raise RuntimeError(f"Java {major} was not found") + + +# ---------- サーバー ---------- + +def sign_item(minecraft): + return "minecraft:oak_sign" if version_key(minecraft) >= (1, 14, 0) else "minecraft:sign" + + +# 起動と同時にサーバーへ接続すると、うまく入れない組み合わせ。キーは Minecraft のバージョンか「ローダー:バージョン」。 +# どれも、タイトル画面から普通に入る分には起きない。 +# - 1.14: リソースの読み込みが終わる前にワールドが表示されて落ちる (Mod なしでも起きる。1.14.1 で直っている) +# - Forge 1.14.2 / 1.14.3: 接続の手順が、Mod の読み込みと重なると途中で止まる +# - Forge 1.15 / 1.15.1: 読み込み中の画面と接続の画面が重なると落ちる (Mod なしでも起きる) +# - 1.17: 描画の準備が終わる前に接続の画面を描こうとして落ちる (Mod なしでも起きる。1.17.1 で直っている) +# これらでは、起動時には接続せず、タイトル画面が出てから Mod の動作確認の機能に接続させる。 +# 基準の取得 (Mod なし) では接続できないので、タイトル画面までの警告だけを基準にする +MOD_JOIN = {"1.14", "forge:1.14.2", "forge:1.14.3", "forge:1.15", "forge:1.15.1", "1.17"} + +# ランチャーだけでは Forge をインストールできないバージョン (forge_install_fix.py を参照) +FORGE_INSTALL_FIX = {"1.14.2", "1.14.3"} + + +class Server: + def __init__(self, minecraft, root, main_dir, port): + self.minecraft = minecraft + self.directory = root / "servers" / minecraft + self.main_dir = main_dir + self.port = port + self.process = None + self.lines = [] + self.joined = threading.Event() + self.ready = threading.Event() + + def prepare(self): + self.directory.mkdir(parents=True, exist_ok=True) + jar = self.directory / "server.jar" + if not jar.exists(): + manifest = fetch_json(MANIFEST_URL) + entry = next((v for v in manifest["versions"] if v["id"] == self.minecraft), None) + if entry is None: + raise RuntimeError(f"Unknown Minecraft version: {self.minecraft}") + url = fetch_json(entry["url"])["downloads"]["server"]["url"] + log(f"downloading server {self.minecraft}") + download(url, jar) + + # 毎回まっさらなワールドで始める + shutil.rmtree(self.directory / "world", ignore_errors=True) + for name in ("logs", "ops.json", "ops.txt"): + target = self.directory / name + if target.is_dir(): + shutil.rmtree(target, ignore_errors=True) + elif target.exists(): + target.unlink() + (self.directory / "eula.txt").write_text("eula=true\n") + (self.directory / "server.properties").write_text("\n".join([ + f"server-port={self.port}", + "server-ip=127.0.0.1", + "online-mode=false", + "enforce-secure-profile=false", + # 新しいバージョンでは、既定でホワイトリストが有効になっている + "white-list=false", + "enforce-whitelist=false", + "level-type=flat" if version_key(self.minecraft) >= (1, 13, 0) else "level-type=FLAT", + "generate-structures=false", + "spawn-protection=0", + "gamemode=survival" if version_key(self.minecraft) >= (1, 14, 0) else "gamemode=0", + "force-gamemode=true", + "difficulty=peaceful" if version_key(self.minecraft) >= (1, 14, 0) else "difficulty=0", + "spawn-monsters=false", + "spawn-animals=false", + "spawn-npcs=false", + "view-distance=4", + "max-players=2", + "enable-command-block=false", + "motd=MarumaSign verify", + "", + ])) + + def start(self): + java = find_java(java_major_for(self.minecraft), self.main_dir) + log(f"starting server {self.minecraft} with {java}") + self.process = subprocess.Popen( + [str(java), "-Xmx1G", "-jar", "server.jar", "nogui"], + cwd=self.directory, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, + text=True, encoding="utf-8", errors="replace", + ) + threading.Thread(target=self._read, daemon=True).start() + if not self.ready.wait(300): + raise RuntimeError("The server did not start. Last lines:\n" + "\n".join(self.lines[-20:])) + + def _read(self): + for line in self.process.stdout: + line = line.rstrip() + self.lines.append(line) + if "Done (" in line: + self.ready.set() + if f"{PLAYER} joined the game" in line: + self.joined.set() + + def command(self, text): + if self.process and self.process.poll() is None: + self.process.stdin.write(text + "\n") + self.process.stdin.flush() + + def move_player(self, distance): + """プレイヤーを、いまの場所から離れた場所へ移動させる。""" + if version_key(self.minecraft) >= (1, 13, 0): + self.command(f"execute as {PLAYER} at @s run tp @s ~{distance} ~ ~") + else: + self.command(f"tp {PLAYER} ~{distance} ~ ~") + + def give_sign_item(self, lines): + """看板の文字をデータとして持つ看板アイテムを、プレイヤーに渡す。データの書き方はバージョンによって違う。""" + version = version_key(self.minecraft) + if version >= (1, 21, 5): + # 文字はそのまま保存する + messages = ",".join('"' + line + '"' for line in lines) + else: + # 文字は JSON のテキストコンポーネントとして保存する + messages = ",".join("'" + json.dumps({"text": line}, separators=(",", ":")) + "'" for line in lines) + if version >= (1, 20, 5): + item = f'minecraft:oak_sign[minecraft:block_entity_data={{id:"minecraft:sign",front_text:{{messages:[{messages}]}}}}]' + self.command(f"give {PLAYER} {item}") + elif version >= (1, 20, 0): + self.command(f"give {PLAYER} minecraft:oak_sign{{BlockEntityTag:{{front_text:{{messages:[{messages}]}}}}}}") + elif version >= (1, 13, 0): + texts = ",".join(f"Text{i + 1}:'" + json.dumps({"text": line}, separators=(",", ":")) + "'" + for i, line in enumerate(lines)) + self.command(f"give {PLAYER} {sign_item(self.minecraft)}{{BlockEntityTag:{{{texts}}}}}") + elif version >= (1, 8, 0): + texts = ",".join(f"Text{i + 1}:" + json.dumps(json.dumps({"text": line}, separators=(",", ":"))) + for i, line in enumerate(lines)) + self.command(f"give {PLAYER} minecraft:sign 1 0 {{BlockEntityTag:{{{texts}}}}}") + else: + # 1.7.10 は文字をそのまま保存する + texts = ",".join(f'Text{i + 1}:"{line}"' for i, line in enumerate(lines)) + self.command(f"give {PLAYER} minecraft:sign 1 0 {{BlockEntityTag:{{{texts}}}}}") + + def on_join(self): + """プレイヤーが入ったら、サバイバルモードで看板を持たせる。""" + time.sleep(2) + if version_key(self.minecraft) >= (1, 13, 0): + self.command(f"gamemode survival {PLAYER}") + else: + self.command(f"gamemode 0 {PLAYER}") + self.command(f"give {PLAYER} {sign_item(self.minecraft)} 16") + self.command("time set 6000" if version_key(self.minecraft) < (1, 13, 0) else "time set noon") + self.command("weather clear") + + def stop(self): + if self.process is None: + return + if self.process.poll() is None: + self.command("stop") + try: + self.process.wait(60) + except subprocess.TimeoutExpired: + self.process.kill() + + +# ---------- クライアント ---------- + +def launcher_spec(minecraft, loader, loader_version): + if loader == "vanilla": + return minecraft + if loader == "fabric": + return f"fabric:{minecraft}:{loader_version}" if loader_version else f"fabric:{minecraft}" + if loader == "forge": + return f"forge:{minecraft}-{loader_version}" if loader_version else f"forge:{minecraft}" + if loader == "neoforge": + return f"neoforge:{loader_version}" + raise RuntimeError(f"Unsupported loader: {loader}") + + +# ---------- LiteLoader ---------- +# ランチャーは LiteLoader を直接扱えないため、公式のバージョン情報から起動用のプロファイルを作る + +LITELOADER_VERSIONS_URL = "https://dl.liteloader.com/versions/versions.json" +MAVEN_CENTRAL = "https://repo1.maven.org/maven2/" + + +def file_md5(path): + import hashlib + return hashlib.md5(path.read_bytes()).hexdigest() + + +def maven_path(name): + group, artifact, version = name.split(":")[:3] + return f"{group.replace('.', '/')}/{artifact}/{version}/{artifact}-{version}.jar" + + +def fetch_library(main_dir, name, repositories): + """ライブラリをランチャーのフォルダに置く。SNAPSHOT は最新のものを取得する。""" + target = main_dir / "libraries" / maven_path(name) + if target.is_file(): + return + group, artifact, version = name.split(":")[:3] + errors = [] + for repository in repositories: + base = f"{repository.rstrip('/')}/{group.replace('.', '/')}/{artifact}/{version}/" + urls = [base + f"{artifact}-{version}.jar"] + if version.endswith("-SNAPSHOT"): + try: + with urllib.request.urlopen(base + "maven-metadata.xml", timeout=60) as response: + metadata = response.read().decode("utf-8", "replace") + timestamp = re.search(r"([^<]+)", metadata) + build = re.search(r"([^<]+)", metadata) + if timestamp and build: + resolved = version.replace("SNAPSHOT", f"{timestamp.group(1)}-{build.group(1)}") + urls.insert(0, base + f"{artifact}-{resolved}.jar") + except OSError as error: + errors.append(f"{base}: {error}") + for url in urls: + try: + download(url, target) + return + except OSError as error: + errors.append(f"{url}: {error}") + raise RuntimeError(f"Could not download {name}:\n" + "\n".join(errors)) + + +def patch_optifine(main_dir, minecraft, installer): + """OptiFine を Minecraft 本体に当てて、ライブラリとして置く。ライブラリの名前を返す。""" + version = installer.stem.replace("OptiFine_", "") + name = f"optifine:OptiFine:{version}" + target = main_dir / "libraries" / maven_path(name) + if not target.is_file(): + target.parent.mkdir(parents=True, exist_ok=True) + java = find_java(8, main_dir) + client = main_dir / "versions" / minecraft / f"{minecraft}.jar" + # OptiFine の配布ファイルに入っている、インストーラーと同じ処理 + patched = subprocess.run([str(java), "-cp", str(installer), "optifine.Patcher", + str(client), str(installer), str(target)], + capture_output=True, text=True, timeout=600) + if patched.returncode != 0 or not target.is_file(): + raise RuntimeError(f"OptiFine could not be patched: {(patched.stderr or patched.stdout)[-300:]}") + return name + + +def install_liteloader(main_dir, minecraft, base_command, optifine=None): + """LiteLoader の起動用プロファイルを作り、そのバージョン ID を返す。 + + optifine に OptiFine の配布ファイルを指定すると、OptiFine も一緒に読み込むプロファイルにする。 + """ + versions = fetch_json(LITELOADER_VERSIONS_URL)["versions"] + if minecraft not in versions: + raise RuntimeError(f"LiteLoader does not support Minecraft {minecraft}") + entry = versions[minecraft] + # リリース版の配布サーバーは一部が停止しているため、スナップショットがあればそちらを使う + snapshot = "snapshots" in entry + stream = entry["snapshots"] if snapshot else entry["artefacts"] + build = stream["com.mumfrey:liteloader"]["latest"] + repository = entry["repo"]["url"].replace("http://", "https://") + if snapshot: + repository = "https://repo.mumfrey.com/content/repositories/snapshots/" + + # バニラのプロファイルが必要なので、先にバニラを用意する + subprocess.run(base_command + ["start", "--dry", minecraft, "-u", PLAYER], capture_output=True) + vanilla = json.loads((main_dir / "versions" / minecraft / f"{minecraft}.json").read_text(encoding="utf-8")) + + libraries = [{"name": f"com.mumfrey:liteloader:{build['version']}"}] + libraries += list(build.get("libraries", [])) + list(stream.get("libraries", [])) + seen = set() + unique = [] + for library in libraries: + if library["name"] in seen: + continue + seen.add(library["name"]) + unique.append({"name": library["name"]}) + if library["name"].startswith("com.mumfrey:liteloader:"): + target = main_dir / "libraries" / maven_path(library["name"]) + if not target.is_file() or file_md5(target) != build["md5"]: + # 配布の形式がバージョンによって違うので、候補を順に試してチェックサムが合うものを使う。 + # 実環境用 (難読化された名前) の jar は release という種別になっていることが多い + base = f"{repository.rstrip('/')}/com/mumfrey/liteloader/{build['version']}/" + names = [build["version"]] + if build["version"].endswith("-SNAPSHOT"): + with urllib.request.urlopen(base + "maven-metadata.xml", timeout=60) as response: + metadata = response.read().decode("utf-8", "replace") + timestamp = re.search(r"([^<]+)", metadata).group(1) + number = re.search(r"([^<]+)", metadata).group(1) + names.insert(0, build["version"].replace("SNAPSHOT", f"{timestamp}-{number}")) + candidates = [] + for name in names: + candidates += [base + f"liteloader-{name}-release.jar", base + f"liteloader-{name}.jar"] + # 古いリリース版は Minecraft のバージョンごとのフォルダに置かれている + candidates.append(f"{repository.rstrip('/')}/com/mumfrey/liteloader/{minecraft}/{build['file']}") + downloaded = [] + for url in candidates: + try: + download(url, target) + except OSError: + continue + downloaded.append(url) + if file_md5(target) == build["md5"]: + break + else: + # 公式の一覧より新しいビルドが公開されているとチェックサムは合わない。 + # その場合は最新の実環境用の jar を使い、そのことを記録に残す + if not downloaded: + raise RuntimeError(f"LiteLoader for {minecraft} could not be downloaded") + download(downloaded[0], target) + log(f"note: LiteLoader {minecraft} does not match the listed checksum; using {downloaded[0]}") + else: + fetch_library(main_dir, library["name"], [ + "https://libraries.minecraft.net/", library.get("url", MAVEN_CENTRAL), MAVEN_CENTRAL, + "https://repo.spongepowered.org/maven/", + ]) + + version_id = f"{minecraft}-LiteLoader" + tweaks = " --tweakClass " + build["tweakClass"] + if optifine is not None: + # OptiFine は、他のローダーと一緒に使うための入口 (起動の引数を自分では渡さないもの) から読み込む + unique.append({"name": patch_optifine(main_dir, minecraft, optifine)}) + version_id += "-OptiFine" + tweaks += " --tweakClass optifine.OptiFineForgeTweaker" + profile = { + "id": version_id, + "inheritsFrom": minecraft, + "type": "release", + "time": vanilla.get("time", ""), + "releaseTime": vanilla.get("releaseTime", ""), + "mainClass": "net.minecraft.launchwrapper.Launch", + "minecraftArguments": vanilla["minecraftArguments"] + tweaks, + "libraries": unique, + } + directory = main_dir / "versions" / version_id + directory.mkdir(parents=True, exist_ok=True) + (directory / f"{version_id}.json").write_text(json.dumps(profile, indent=2), encoding="utf-8") + return version_id + + +# ---------- NeoForge ---------- +# ランチャーは新しい NeoForge のインストーラーに対応していないため、公式のインストーラーを直接実行する + +NEOFORGE_MAVEN = "https://maven.neoforged.net/releases/net/neoforged/neoforge" + + +def install_neoforge(main_dir, minecraft, version, base_command): + """NeoForge をインストールし、そのバージョン ID を返す。""" + version_id = f"neoforge-{version}" + if (main_dir / "versions" / version_id / f"{version_id}.json").is_file(): + return version_id + + # バニラのファイルと Java を先に用意する + subprocess.run(base_command + ["start", "--dry", minecraft, "-u", PLAYER], capture_output=True, timeout=1500) + installer = main_dir / "installers" / f"neoforge-{version}-installer.jar" + if not installer.is_file(): + download(f"{NEOFORGE_MAVEN}/{version}/neoforge-{version}-installer.jar", installer) + profiles = main_dir / "launcher_profiles.json" + if not profiles.is_file(): + # インストーラーは公式ランチャーのプロファイルがあることを前提にしている + profiles.write_text('{"profiles": {}}', encoding="utf-8") + + java = find_java(java_major_for(minecraft), main_dir) + result = subprocess.run([str(java), "-jar", str(installer), "--install-client", str(main_dir)], + capture_output=True, text=True, encoding="utf-8", errors="replace", timeout=1500) + if result.returncode != 0: + raise RuntimeError("NeoForge installer failed: " + (result.stdout + result.stderr)[-1500:]) + return version_id + + +OPTIONS = """\ +pauseOnLostFocus:false +tutorialStep:none +onboardAccessibility:false +skipMultiplayerWarning:true +joinedFirstServer:true +narrator:0 +fullscreen:false +renderDistance:4 +maxFps:60 +fov:0.0 +soundCategory_master:0.0 +lang:{lang} +""" + + +def prepare_work_dir(work_dir, mod, lang): + shutil.rmtree(work_dir, ignore_errors=True) + (work_dir / "mods").mkdir(parents=True, exist_ok=True) + if mod is not None: + shutil.copy2(mod, work_dir / "mods" / mod.name) + (work_dir / "options.txt").write_text(OPTIONS.format(lang=lang)) + # 動画や音声の確認で音が鳴らないように、音量を 0 にしておく + (work_dir / "config").mkdir(exist_ok=True) + (work_dir / "config" / "marumasa_sign.json").write_text('{\n "MaxThreads": 5,\n "Volume": 0\n}\n') + + +def minecraft_windows(): + """Minecraft のウィンドウを (ハンドル, 位置) の一覧で返す。""" + import ctypes + from ctypes import wintypes + + user32 = ctypes.windll.user32 + found = [] + + @ctypes.WINFUNCTYPE(wintypes.BOOL, wintypes.HWND, wintypes.LPARAM) + def visit(window, _): + if user32.IsWindowVisible(window): + title = ctypes.create_unicode_buffer(256) + user32.GetWindowTextW(window, title, 256) + if title.value.startswith("Minecraft"): + rect = wintypes.RECT() + user32.GetWindowRect(window, ctypes.byref(rect)) + if rect.right - rect.left > 200: + found.append((window, (rect.left, rect.top, rect.right, rect.bottom))) + return True + + user32.EnumWindows(visit, 0) + return found + + +def minecraft_window_box(): + """Minecraft のウィンドウの位置を返す。見つからなければ None。""" + windows = minecraft_windows() + return windows[0][1] if windows else None + + +def close_minecraft_window(): + """ウィンドウの閉じるボタンを押したのと同じ方法で、ゲームを通常どおり終了させる。""" + import ctypes + + for window, _ in minecraft_windows(): + ctypes.windll.user32.PostMessageW(window, 0x0010, 0, 0) # WM_CLOSE + + +def grab_screen(path): + """Minecraft のウィンドウだけを画像として保存する。""" + try: + from PIL import ImageGrab + except ImportError: + return False + if sys.platform != "win32": + return False + windows = minecraft_windows() + if not windows: + return False + import ctypes + # 他のウィンドウに隠れていると写らないので、手前に出してから撮る + window, box = windows[0] + ctypes.windll.user32.ShowWindow(window, 9) # SW_RESTORE + ctypes.windll.user32.SetForegroundWindow(window) + time.sleep(0.7) + try: + ImageGrab.grab(bbox=box, all_screens=True).save(path) + return True + except Exception: + try: + ImageGrab.grab(bbox=box).save(path) + return True + except Exception: + return False + + +# テスト画像の 4 つの領域の色 (左上, 右上, 左下, 右下) +TEST_COLORS = {"red": (230, 60, 60), "green": (60, 180, 75), "blue": (60, 110, 230), "yellow": (250, 200, 40)} + + +def analyze_screenshot(path): + """スクリーンショットにテスト画像が正しい向きで写っているかを調べる。""" + from PIL import Image + + image = Image.open(path).convert("RGB") + image.thumbnail((640, 640)) + width, height = image.size + pixels = image.load() + sums = {name: [0, 0, 0] for name in TEST_COLORS} + for y in range(height): + for x in range(width): + name = classify(*pixels[x, y]) + if name is not None: + entry = sums[name] + entry[0] += 1 + entry[1] += x + entry[2] += y + return judge_colours(sums, width, height) + + +# シェーダーを使っているときの判定で見る位置 (画面の幅と高さに対する割合) と、そこにあるはずの色合い (色相の範囲、度)。 +# テスト画像は、どのバージョンでも画面のほぼ同じ場所に写る +SHADED_POINTS = [ + ("red", 0.37, 0.46, [(320, 360), (0, 25)]), + ("green", 0.63, 0.46, [(90, 175)]), + ("blue", 0.37, 0.66, [(195, 265)]), + ("yellow", 0.63, 0.66, [(35, 85)]), +] + + +def analyze_screenshot_shaded(path): + """シェーダーを使っているときの、テスト画像の判定。 + + シェーダーは絵にも影や空の色を付けるので、色そのものは元の画像と大きく変わる。 + そこで、絵の 4 つの区画があるはずの位置の色合い (色相) が、赤・緑・青・黄の並びになっているかを調べる。 + 絵がなければ、上の 2 か所は空、下の 2 か所は地面の色になるので、区別できる。 + """ + import colorsys + + from PIL import Image + + image = Image.open(path).convert("RGB") + width, height = image.size + found = {} + for name, fx, fy, ranges in SHADED_POINTS: + # 周りを含めて平均した色で判定する + box = (int(width * fx) - 6, int(height * fy) - 6, int(width * fx) + 7, int(height * fy) + 7) + patch = image.crop(box).resize((1, 1), Image.BOX).getpixel((0, 0)) + hue, saturation, value = colorsys.rgb_to_hsv(patch[0] / 255, patch[1] / 255, patch[2] / 255) + degrees = hue * 360 + found[name] = (round(degrees), round(saturation, 2), round(value, 2)) + if saturation < 0.2 or value < 0.08 or not any(low <= degrees <= high for low, high in ranges): + return False, f"test image not found at the expected place (hue, saturation, value: {found})" + return True, "test image visible (shaded)" + + +def analyze_item_view(path): + """画面の下にあるホットバーに、テスト画像の見た目になった看板アイテムが写っているかを調べる。""" + from PIL import Image + + image = Image.open(path).convert("RGB") + width, height = image.size + # ホットバーは画面の下の中央にある。手に持ったアイテム (右下) と、すぐ上にある体力の表示 (赤) は範囲に入れない + region = image.crop((int(width * 0.28), int(height * 0.905), int(width * 0.72), height)) + pixels = region.load() + sums = {name: [0, 0, 0] for name in TEST_COLORS} + for y in range(region.height): + for x in range(region.width): + name = classify(*pixels[x, y]) + if name is not None: + entry = sums[name] + entry[0] += 1 + entry[1] += x + entry[2] += y + counts = {name: entry[0] for name, entry in sums.items()} + # 枠 1 つ分の小さな絵なので、色ごとに少しでも写っていればよい + if any(count < 12 for count in counts.values()): + return False, f"item picture not found in the hotbar (pixels: {counts})" + centre = {name: (entry[1] / entry[0], entry[2] / entry[0]) for name, entry in sums.items()} + ordered = (centre["red"][0] < centre["green"][0] and centre["blue"][0] < centre["yellow"][0] + and centre["red"][1] < centre["blue"][1] and centre["green"][1] < centre["yellow"][1]) + if not ordered: + return False, f"item picture is mirrored or rotated (centres: {centre})" + return True, "item picture visible" + + +def analyze_sign_view(path): + """看板の位置を見下ろした画面に、看板の板が写っていないかを調べる。""" + from PIL import Image + + image = Image.open(path).convert("RGB") + image.thumbnail((640, 640)) + width, height = image.size + pixels = image.load() + # 看板は画面の中央付近に来る。右下に写る手持ちの看板は範囲に入れない + wood = total = 0 + for y in range(int(height * 0.15), int(height * 0.70)): + for x in range(int(width * 0.30), int(width * 0.70)): + r, g, b = pixels[x, y] + total += 1 + # 木の板の色 (赤 > 緑 > 青 で、くすんだ茶色) + if 90 < r < 225 and 12 <= r - g <= 65 and 25 <= g - b <= 95: + wood += 1 + ratio = wood / max(1, total) + if ratio > 0.012: + return False, f"sign board seems visible ({ratio:.1%} of the centre is wood-coloured)" + return True, "sign hidden" + + +def classify(r, g, b): + """ピクセルがテスト画像のどの色かを、明るさに左右されないよう色の比率で判定する。""" + if r > 80 and r > 2.5 * g and r > 2.5 * b: + return "red" + if g > 80 and g > 2.0 * r and g > 1.8 * b: + return "green" + if b > 80 and b > 1.6 * g and b > 2.5 * r: + return "blue" + if r > 100 and g < r < 1.6 * g and b < 0.35 * g: + return "yellow" + return None + + +def judge_colours(sums, width, height): + counts = {name: entry[0] for name, entry in sums.items()} + minimum = width * height // 400 + if any(count < minimum for count in counts.values()): + return False, f"test image colours not found (pixels: {counts})" + centre = {name: (entry[1] / entry[0], entry[2] / entry[0]) for name, entry in sums.items()} + ordered = (centre["red"][0] < centre["green"][0] and centre["blue"][0] < centre["yellow"][0] + and centre["red"][1] < centre["blue"][1] and centre["green"][1] < centre["yellow"][1]) + if not ordered: + return False, f"test image is mirrored or rotated (centres: {centre})" + return True, "test image visible" + + +# ---------- ログの確認 ---------- + +LEVEL_PATTERN = re.compile(r"(\[|/)(WARN|WARNING|ERROR|FATAL|SEVERE)(\]|:)") + + +def scan_log(path): + """警告とエラーの行を集める。""" + if not path.is_file(): + return None + findings = [] + for line in path.read_text(encoding="utf-8", errors="replace").splitlines(): + # OpenGL のエラーは、ログには INFO として出る (Minecraft 1.17 以降、GL のデバッグ出力から) + gl_error = "OpenGL debug message" in line and "type=ERROR" in line + if LEVEL_PATTERN.search(line) or gl_error or "Exception" in line or "marumasa" in line.lower() and "error" in line.lower(): + findings.append(line[:400]) + return findings + + +def load_known_noise(): + """Mod 由来でないと分かっている行の正規表現を読み込む。""" + patterns = [] + for line in Path(__file__).with_name("known-noise.txt").read_text(encoding="utf-8").splitlines(): + line = line.strip() + if line and not line.startswith("#"): + patterns.append(re.compile(line)) + return patterns + + +def normalize(line): + """時刻や数値の違いを無視して比較できる形にする。""" + line = re.sub(r"^\[[^\]]*\d\d:\d\d:\d\d[^\]]*\]\s*", "", line) + # 同じ処理でも、どのスレッドが先に行うかは起動ごとに変わる ("[Render thread/WARN]" -> "[WARN]") + line = re.sub(r"^\[[^\]/]*/(\w+)\]", r"[\1]", line) + # 基準の取得と本番では作業フォルダの名前が違う + line = line.replace("-baseline\\", "\\").replace("-baseline/", "/") + # オブジェクトのハッシュ値 (ModConfig@110dc235 など) は実行のたびに変わる + # (古い規則で数字だけを N にして保存した基準 ("@NaN" など) とも比べられるように、N も含める) + line = re.sub(r"@(?=[0-9a-fA-FN]*[0-9N])[0-9a-fA-FN]{2,16}\b", "@H", line) + # 記録する行は長さで切っているので、行頭の長さの違いで末尾が変わらないよう、比べる長さもそろえる + return re.sub(r"\d+", "N", line)[:300] + + +def unique(lines): + """同じ内容の行をまとめる。""" + seen = set() + result = [] + for line in lines: + key = normalize(line) + if key not in seen: + seen.add(key) + result.append(line) + return result + + +def find_client_log(work_dir): + for candidate in (work_dir / "logs" / "latest.log", work_dir / "logs" / "fml-client-latest.log", work_dir / "output-client.log"): + if candidate.is_file(): + return candidate + return work_dir / "logs" / "latest.log" + + +def run(args): + root = Path(args.root) + main_dir = root / "main" + if args.baseline: + args.mod = None + # 影 Mod を入れて確認する場合は、結果も基準も別に持つ + shaders = bool(getattr(args, "shaders", False)) + shader_pack = getattr(args, "shader_pack", None) or shadermods.SHADER_PACK + variant = f"{args.loader}-{args.minecraft}" + ("-shaders" if shaders else "") + shader_mod = getattr(args, "shader_mod", None) + if shaders and shadermods.variant(shader_pack, shader_mod): + variant += "-" + shadermods.variant(shader_pack, shader_mod) + name = variant + ("-baseline" if args.baseline else "") + work_dir = root / "runs" / name + result_dir = work_dir / "selftest" + mod = Path(args.mod).resolve() if args.mod else None + # 看板に表示して確かめるファイル。| で区切って複数指定できる + images = [Path(item).resolve() for item in str(args.image).split("|") if item] + + prepare_work_dir(work_dir, mod, args.lang) + result = { + "minecraft": args.minecraft, "loader": args.loader, "loader_version": args.loader_version, + "mod": mod.name if mod else None, "ok": False, "detail": "", + } + shader_setup = None + if shaders: + shader_setup = shadermods.resolve(args.loader, args.minecraft, root / "shadermods", shader_pack, + shader_mod) + if shader_setup is None: + result["detail"] = "No shader mod is available for this combination" + return result + shadermods.install(shader_setup, root / "shadermods", work_dir) + result["shader_mod"] = shader_setup["name"] + result["shader_pack"] = shader_pack + log(f"shader mod: {shader_setup['name']} " + f"{[item for item, _ in shader_setup['mods']] or shader_setup['library'].name} + {shader_setup['pack'][0]}") + + host = MockHost() + # 通信が途中で止まっても待ち続けないように、ランチャーの通信にタイムアウトを付ける + base = ["portablemc", "--timeout", "60", "--main-dir", str(main_dir), "--work-dir", str(work_dir), "--output", "human"] + if args.spec: + spec = args.spec + elif args.loader == "liteloader": + spec = install_liteloader(main_dir, args.minecraft, base, + shader_setup.get("library") if shader_setup else None) + elif args.loader == "neoforge" and not args.loader_version.startswith("1.20.1-"): + spec = install_neoforge(main_dir, args.minecraft, args.loader_version, base) + else: + spec = launcher_spec(args.minecraft, args.loader, args.loader_version) + + # 先にクライアントのファイルを揃える (サーバー用の Java もここで手に入る) + log(f"installing {spec}") + install_command = base + if args.loader == "forge" and args.minecraft in FORGE_INSTALL_FIX: + # このバージョンの Forge は、ランチャーだけではインストールの後処理が通らない + install_command = [sys.executable, str(Path(__file__).with_name("forge_install_fix.py")), + str(find_java(8, main_dir, bundled=False))] + base[1:] + if not (main_dir / "versions" / spec.replace(":", "-") / (spec.replace(":", "-") + ".json")).is_file(): + # 途中で失敗したときの出力が残っていると、やり直しても同じ失敗になる + for leftover in (main_dir / "libraries" / "net" / "minecraft" / "client").glob(args.minecraft + "*"): + shutil.rmtree(leftover, ignore_errors=True) + failure = "" + for attempt in range(3): + # ダウンロードの失敗は一時的なことが多いので、何度か試す + try: + install = subprocess.run(install_command + ["start", "--dry", spec, "-u", PLAYER], capture_output=True, text=True, + encoding="utf-8", errors="replace", timeout=1500) + except subprocess.TimeoutExpired: + failure = "timed out" + continue + if install.returncode == 0: + failure = "" + break + failure = (install.stdout + install.stderr)[-1500:] + if failure: + result["detail"] = "Launcher install failed: " + failure + host.close() + return result + + server = Server(args.minecraft, root, main_dir, args.port) + client = None + title_only = False + mod_join = args.minecraft in MOD_JOIN or f"{args.loader}:{args.minecraft}" in MOD_JOIN + try: + server.prepare() + server.start() + + jvm_args = " ".join([ + "-Xmx2G", + f"-Dmarumasign.selftest={result_dir}", + "-Dmarumasign.selftest.image=" + "|".join(str(image) for image in images), + "-Dmarumasign.selftest.item=true", + f"-Dmarumasign.uploadUrl=http://127.0.0.1:{host.port}/upload", + f"-Dmarumasign.shortenUrl=http://127.0.0.1:{host.port}/shorten", + ] + ([f"-Dmarumasign.selftest.server=127.0.0.1:{args.port}"] if mod_join else []) + + os.environ.get("MARUMASIGN_VERIFY_JVM_ARGS", "").split()) + command = base + ["start", spec, "-u", PLAYER] + ([] if mod_join else ["-s", "127.0.0.1", "-p", str(args.port)]) \ + + ["--resolution", "1280x720", f"--jvm-args={jvm_args}"] + log("starting client") + client_log = open(work_dir / "launcher-output.log", "w", encoding="utf-8", errors="replace") + client = subprocess.Popen(command, stdout=client_log, stderr=subprocess.STDOUT) + + deadline = time.time() + args.timeout + started_at = time.time() + joined_handled = False + joined_at = 0.0 + captured = False + # ファイルごとの結果と、次に待つ合図 + media = [{"name": image.name} for image in images] + current = 0 + stage = "view" + item_stage = "request" + while time.time() < deadline: + if client.poll() is not None: + break + if server.joined.is_set() and not joined_handled: + joined_handled = True + joined_at = time.time() + log("player joined") + threading.Thread(target=server.on_join, daemon=True).start() + if (result_dir / "result.txt").is_file() and not captured: + captured = True + time.sleep(0.5) + if not args.baseline and grab_screen(work_dir / "screenshot.png"): + result["screenshot"] = str(work_dir / "screenshot.png") + if not args.baseline and current < len(media): + entry = media[current] + if stage == "view" and (result_dir / f"view-{current}.txt").is_file(): + # 画像の全体が写っている状態 + shot = work_dir / f"screenshot-{current}.png" + if grab_screen(shot): + entry["visible"], entry["detail"] = analyze_screenshot(shot) + if shaders and not entry["visible"]: + entry["visible"], entry["detail"] = analyze_screenshot_shaded(shot) + stage = "sign" + elif stage == "sign" and (result_dir / f"sign-view-{current}.txt").is_file(): + # 看板の位置を見下ろしている状態 + shot = work_dir / f"screenshot-sign-{current}.png" + if grab_screen(shot): + entry["sign_hidden"], entry["sign_detail"] = analyze_sign_view(shot) + stage = "move" + elif stage == "move" and (result_dir / f"move-{current}.txt").is_file(): + # 次のファイルは、前の看板が見えない場所で確認する + # 前の看板が読み込まれている範囲 (描画距離 4 チャンク) の外まで離れる。 + # 遠くへ飛ばしすぎると、古いバージョンでは移動先の地形がなかなか届かない + server.move_player(112) + time.sleep(1.0) + (result_dir / f"moved-{current}.txt").write_text("done\n") + current += 1 + stage = "view" + if not args.baseline and item_stage == "request" and (result_dir / "item-request.txt").is_file(): + # 看板の文字を持たせた看板アイテムを渡す。置いた看板と区別できるように、別の URL にする + host.files["item.png"] = images[0].read_bytes() + url = f"http://127.0.0.1:{host.port}/i/item.png" + text = url + "|0|0|0|1|1|0|0|0" + server.give_sign_item([text[i:i + 15] for i in range(0, 60, 15)]) + time.sleep(1.0) + (result_dir / "item-given.txt").write_text(url) + item_stage = "view" + elif not args.baseline and item_stage == "view" and (result_dir / "item-view.txt").is_file(): + shot = work_dir / "screenshot-item.png" + if grab_screen(shot): + result["item_visible"], result["item_detail"] = analyze_item_view(shot) + item_stage = "done" + if args.baseline and joined_handled and time.time() - joined_at > (75 if shaders else 25): + # 基準の取得では、ワールドに入ってしばらくしたら終了する + # (シェーダーは、ワールドに入ってからの準備に時間がかかり、その間に警告を出すので長く待つ) + result["detail"] = "baseline" + break + if args.baseline and mod_join and time.time() - started_at > 40: + # 接続しない基準の取得では、ログが落ち着いたら (タイトル画面まで進んだら) 終了する + client_log_file = find_client_log(work_dir) + if client_log_file.is_file() and time.time() - client_log_file.stat().st_mtime > 15: + result["detail"] = "baseline (title screen only)" + title_only = True + break + time.sleep(0.5) + else: + result["detail"] = "Timed out" + + if client.poll() is None and sys.platform == "win32": + # 終了時に出る警告も記録できるよう、まず通常の方法で閉じる + close_minecraft_window() + try: + client.wait(45) + except subprocess.TimeoutExpired: + pass + if client.poll() is None: + # クライアントが自分で終了しなかった + subprocess.run(["taskkill", "/F", "/T", "/PID", str(client.pid)], capture_output=True) + client_log.close() + finally: + server.stop() + host.close() + + if not args.baseline: + result["media"] = media + result["image_visible"] = all(entry.get("visible") for entry in media) + result["sign_hidden"] = all(entry.get("sign_hidden") for entry in media) + result["image_detail"] = ", ".join(f"{entry['name']}: {entry.get('detail', 'not captured')}" for entry in media) + result["sign_detail"] = ", ".join(f"{entry['name']}: {entry.get('sign_detail', 'not captured')}" for entry in media) + + result_file = result_dir / "result.txt" + if result_file.is_file(): + lines = result_file.read_text(encoding="utf-8").splitlines() + result["ok"] = bool(lines) and lines[0] == "OK" + result["detail"] = lines[1] if len(lines) > 1 else "" + elif not result["detail"]: + result["detail"] = "The client exited without a self test result" + result["joined"] = server.joined.is_set() + result["uploads"] = len(host.files) + result["http_requests"] = host.requests + + if shaders: + # シェーダーが実際に有効になっていたかどうかを、ログで確かめる + client_log_file = find_client_log(work_dir) + log_text = client_log_file.read_text(encoding="utf-8", errors="replace") if client_log_file.is_file() else "" + result["shaders_active"] = shadermods.is_active(log_text) + client_findings = scan_log(find_client_log(work_dir)) + result["client_log"] = str(find_client_log(work_dir)) + client_findings = unique(client_findings) if client_findings is not None else ["(no client log)"] + server_findings = unique(line[:400] for line in server.lines if LEVEL_PATTERN.search(line) or "Exception" in line) + (work_dir / "server-output.log").write_text("\n".join(server.lines), encoding="utf-8") + + # Mod を入れていない状態 (基準) でも出る警告は、ローダーや Minecraft 自体のもの + baseline_file = root / "baselines" / f"{variant}.json" + if args.baseline: + result["ok"] = server.joined.is_set() or title_only + baseline_file.parent.mkdir(parents=True, exist_ok=True) + # 途中で終わってしまった起動の記録は、基準として残さない (警告が足りない基準になる) + if result["ok"]: + baseline_file.write_text(json.dumps({ + "client": sorted({normalize(line) for line in client_findings}), + "server": sorted({normalize(line) for line in server_findings}), + }, indent=2, ensure_ascii=False), encoding="utf-8") + result["baseline_client_count"] = len(client_findings) + result["baseline_server_count"] = len(server_findings) + elif baseline_file.is_file(): + baseline = json.loads(baseline_file.read_text(encoding="utf-8")) + # 保存後に正規化の規則が増えていても比較できるように、もう一度正規化する + baseline = {side: {normalize(line) for line in lines} for side, lines in baseline.items()} + noise = load_known_noise() + + def is_new(line, known): + return normalize(line) not in known and not any(pattern.search(line) for pattern in noise) + + result["baseline"] = True + result["new_client_findings"] = [line for line in client_findings if is_new(line, baseline["client"])] + result["new_server_findings"] = [line for line in server_findings if is_new(line, baseline["server"])] + result["clean"] = (result["ok"] and bool(result.get("image_visible")) and bool(result.get("sign_hidden")) + and bool(result.get("item_visible")) + and (not shaders or bool(result.get("shaders_active"))) + and not result["new_client_findings"] and not result["new_server_findings"]) + else: + result["baseline"] = False + result["client_findings"] = client_findings + result["server_findings"] = server_findings + + (work_dir / "result.json").write_text(json.dumps(result, indent=2, ensure_ascii=False), encoding="utf-8") + return result + + +def main(): + parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) + parser.add_argument("--minecraft", required=True) + parser.add_argument("--loader", required=True, choices=["vanilla", "forge", "fabric", "neoforge", "liteloader"]) + parser.add_argument("--loader-version", default="") + parser.add_argument("--spec", default="", help="ランチャーに渡すバージョン指定を直接指定する") + parser.add_argument("--mod", default=None, help="mods フォルダに入れるファイル。省略すると Mod なしで起動する") + parser.add_argument("--baseline", action="store_true", + help="Mod を入れずに起動し、ローダーや Minecraft 自体が出す警告を基準として記録する") + parser.add_argument("--image", default=str(REPO / "tools" / "verify" / "test-image.png")) + parser.add_argument("--lang", default="en_us") + parser.add_argument("--port", type=int, default=25570) + parser.add_argument("--timeout", type=int, default=420) + parser.add_argument("--root", default=str(DEFAULT_ROOT)) + args = parser.parse_args() + + result = run(args) + print(json.dumps(result, indent=2, ensure_ascii=False)) + sys.exit(0 if result.get("clean", result["ok"]) else 1) + + +if __name__ == "__main__": + main()