Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DNM] clean up 1.18 #2115

Open
wants to merge 466 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
466 commits
Select commit Hold shift + click to select a range
57c4a05
fix workflow
outductor Dec 31, 2023
946ec3c
fix
outductor Dec 31, 2023
bd13389
revert slf4j
outductor Dec 31, 2023
8de6d74
refactor: ログインランキングと投票ランキングの更新間隔を下げる
rito528 Jan 3, 2024
adbf213
style: scalafix, scalafmt
rito528 Jan 3, 2024
29d9c8e
refactor: ブロック破壊されたアイテムの格納周りをきれいにする
rito528 Jan 3, 2024
6135231
fix: スキル無しでブロックを破壊したときにチェスト内のアイテムが消失する不具合を修正
rito528 Jan 3, 2024
5f31293
fix: チェストなどに空のスロットがあるとエラーになるのを修正
rito528 Jan 3, 2024
6930918
chore: StreamClockの機能を移植
rito528 Jan 4, 2024
4b561c9
fix: eventpriorityをhighestにする
rito528 Jan 4, 2024
89527ad
sentry
outductor Jan 4, 2024
8b46661
chore: オブザーバーをMineStackから削除
rito528 Jan 4, 2024
dc4ed9e
fix: 重力値の計算でY座標が更新されていないのを修正
rito528 Jan 4, 2024
30e2ab3
chore: ログの消し忘れを消す
rito528 Jan 4, 2024
0caf8ab
fix: インベントリを持つブロックを破壊すると中身のアイテムが増殖する不具合を修正
rito528 Jan 4, 2024
c722014
style: scalafmt
rito528 Jan 4, 2024
f2d9507
fix: 通常破壊されたブロックがチェストなどであった場合、MineStackに入れない
rito528 Jan 5, 2024
24ea44c
scalafix
outductor Jan 5, 2024
8de5065
fix: スキル使用時にもチェストの中身をMineStackに入れないようにする
rito528 Jan 5, 2024
da4c215
fix: MineStackの表記ゆれとカテゴリを直す
rito528 Jan 6, 2024
c2e87b3
fix: カテゴリ指定が間違っていたので修正
rito528 Jan 6, 2024
c0797f5
fix: MineStackのアイテム種類選択画面にページャーが実装されていなかったのを直す
rito528 Jan 6, 2024
6d80efd
fix: GameProfileのtexturesをuuidとnameを指定した場合でも指定する
rito528 Jan 6, 2024
c5cc232
fix: authlibを使用しないでスキンを設定するように
rito528 Jan 6, 2024
26b2a5e
fix: MineStackのアイテムリストの修正
rito528 Jan 6, 2024
9284233
fix: 不要なスペースの削除
rito528 Jan 6, 2024
aeffda1
fix: menuでアイコンが正しく表示されないのを修正
rito528 Jan 7, 2024
4d50cb0
docs: 古くなったドキュメントの削除
rito528 Jan 7, 2024
af7a026
pref: 頭のテクスチャを描画するときのパフォーマンスを改善
rito528 Jan 7, 2024
0b2d9ca
fix: 不要なfilterを削除
rito528 Jan 18, 2024
31b35f4
update libs
outductor Jan 19, 2024
1b88199
fix: 鍾乳石による落下ダメージを無効化する
rito528 Jan 19, 2024
da524f9
chore: ダメージを受けたブロックのログを追加
rito528 Jan 19, 2024
a42aeec
fix: 落下ブロックによるダメージを無効化する
rito528 Jan 19, 2024
711824b
style: scalafix,fmt
rito528 Jan 19, 2024
0d37fd8
chore(deps): update dependency com.thesamet:sbt-protoc to v1.0.7
renovate[bot] Jan 21, 2024
4e606e1
chore(deps): update dependency com.thesamet.scalapb:compilerplugin to…
renovate[bot] Jan 21, 2024
e1eea04
docs: 間違ったコメントを修正
rito528 Jan 24, 2024
03acb1d
feat: ガチャ景品を置き換えるコマンドを追加
rito528 Jan 24, 2024
cce5ea8
chore(deps): update dependency eu.timepit:refined to v0.11.1
renovate[bot] Jan 26, 2024
df5c33d
chore(deps): update dependency org.scalatest:scalatest to v3.2.18
renovate[bot] Feb 7, 2024
1382f09
update packages
outductor Feb 11, 2024
3fa40cd
sbt
outductor Feb 11, 2024
cb0d1e8
fix: nmsとcraftBukkitのバージョン指定を変える
rito528 Feb 13, 2024
ba6c677
fix: nmsのバージョンをもどす
rito528 Feb 13, 2024
503f77a
chore: マイグレーションを一旦無効化
rito528 Feb 13, 2024
85eb7f7
chore: マイグレーションを実行するように
rito528 Feb 13, 2024
8c55bcd
chore: convertChunkWiseをprivateにする
rito528 Feb 15, 2024
cae013e
fix: nmsパッケージパスを変更
rito528 Feb 15, 2024
eba8021
Revert "fix: nmsパッケージパスを変更"
rito528 Feb 15, 2024
74c4471
chore: アイテムマイグレーションを停止
rito528 Feb 16, 2024
017cb04
chore: minestackで拾ったアイテムをログに追加
rito528 Feb 16, 2024
38a4c45
Revert "chore: minestackで拾ったアイテムをログに追加"
rito528 Feb 16, 2024
4c5b2e9
scalafix
outductor Feb 17, 2024
da82e47
feat: プレイヤーの頭のリンクを取得してキャッシュできるsubsystemの実装
rito528 Feb 17, 2024
6c6b8c8
feat: playerHeadSkinAPIをつかう
rito528 Feb 18, 2024
6aadfc3
docs: 不要になったドキュメントを消す
rito528 Feb 18, 2024
374344c
fix: スキンのURLのキャッシュをすべてのプレイヤーで共有できるように
rito528 Feb 19, 2024
6c3f2ac
fix: PlayerHeadSkinAPIをプレイヤーのUUIDから呼び出せるように
rito528 Feb 19, 2024
9c59bbf
chore: itemmigrationが走るようにし、不明なコードをコメントアウト
rito528 Feb 20, 2024
1394adc
chore: migrateChunkを実行する前にチャンクをロードさせる
rito528 Feb 20, 2024
3fec94d
chore: チャンクをアンロードする前にForceLoadedをfalseにする
rito528 Feb 20, 2024
1ea5e53
chore: chunkのunloadを強制せず、Spigotに任せる
rito528 Feb 20, 2024
1adfa1b
chore: loadbeforeにMultiverse-PortalsとCustomEnchantmentsを追加する
rito528 Feb 21, 2024
4643448
chore: reloadWorldをMultiverse経由で行う
rito528 Feb 27, 2024
0a81ecb
Revert "chore: reloadWorldをMultiverse経由で行う"
rito528 Feb 27, 2024
e12103f
docs: ワールドのアンロードに関するドキュメントを書く
rito528 Feb 27, 2024
9af8cbf
Revert "chore: loadbeforeにMultiverse-PortalsとCustomEnchantmentsを追加する"
rito528 Feb 27, 2024
16fb1c4
chore: serverIdを出力するログの追加
rito528 Feb 28, 2024
212a08d
Revert "chore: serverIdを出力するログの追加"
rito528 Feb 28, 2024
e0243fd
fix: canBreak関数で、BUILDフラグが許可されているときのみじゃなく保護のメンバーかオーナーかを確認するように
rito528 Feb 29, 2024
7d9a660
fix: canBreak関数でWorldGuardのチェックを行うところで関係ない条件が紛れていたので削除
rito528 Feb 29, 2024
5cb66db
chore: anniversaryShovel判定のログを入れる
rito528 Mar 1, 2024
384f5e4
fix: HalloweenHoeの耕地にできるブロックの判定を修正
rito528 Mar 1, 2024
1ba41d2
refactor: 保護のメンバーであることをisMemberだけで判定する
rito528 Mar 2, 2024
ddbfb9a
mariadb
outductor Mar 4, 2024
96fd691
sbt
outductor Mar 4, 2024
1838f81
2.13.12
outductor Mar 4, 2024
5823f4d
ci: リリース作成用CIのjava-versionを17にする
rito528 Mar 16, 2024
ccfbf02
ci: ブランチの更新をseichiassist-downloaderに通知するCIを追加
rito528 Mar 28, 2024
7f017b1
update sentry dsn
outductor Jun 25, 2024
754390a
update deps
outductor Jun 27, 2024
910fd9a
update scalafmt
outductor Jun 27, 2024
2cd616f
update deps
outductor Jun 27, 2024
9825df1
update deps
outductor Jun 28, 2024
1f3d3f0
update deps
outductor Jun 28, 2024
0219e69
chore(deps): update dependency com.mojang:authlib to v6.0.54
renovate[bot] Jul 27, 2024
2629cf8
chore(deps): update dependency io.circe:circe-parser to v0.14.9
renovate[bot] Jul 27, 2024
4ce41b1
chore(deps): update dependency scalafmt to v3.8.3
renovate[bot] Jul 27, 2024
e441bf2
chore(deps): update dependency com.eed3si9n:sbt-assembly to v2.2.0
renovate[bot] Jul 27, 2024
db25826
chore(deps): update dependency commons-codec:commons-codec to v1.17.1
renovate[bot] Jul 27, 2024
076a3de
fix: ガチャイベントを作成し、削除することによってデフォルトのガチャアイテムに削除済みのガチャイベント景品が追加されてしまう不具合を修正
rito528 Aug 2, 2024
dee5bd6
Merge pull request #2307 from GiganticMinecraft/renovate/io.circe-cir…
rito528 Aug 2, 2024
9f615fa
chore(deps): update dependency io.circe:circe-generic to v0.14.9
renovate[bot] Aug 2, 2024
a7b3afd
chore(deps): update dependency io.sentry:sentry to v7.13.0
renovate[bot] Aug 2, 2024
2c96f94
Merge pull request #2306 from GiganticMinecraft/renovate/io.circe-cir…
rito528 Aug 2, 2024
8b7cac5
chore(deps): update dependency io.circe:circe-core to v0.14.9
renovate[bot] Aug 2, 2024
3646fd3
Merge pull request #2346 from GiganticMinecraft/renovate/com.mojang-a…
outductor Aug 5, 2024
51370ee
Merge pull request #2348 from GiganticMinecraft/renovate/com.eed3si9n…
outductor Aug 5, 2024
d11d9b9
chore(deps): update dependency org.scalikejdbc:scalikejdbc to v4.3.1
renovate[bot] Aug 5, 2024
056d9d0
Merge pull request #2354 from GiganticMinecraft/renovate/io.sentry-se…
outductor Aug 5, 2024
c7fbc2f
Merge pull request #2357 from GiganticMinecraft/renovate/org.scalikej…
outductor Aug 5, 2024
416f019
chore(deps): update flyway to v10.17.0
renovate[bot] Aug 5, 2024
bd4c2c4
Merge pull request #2358 from GiganticMinecraft/renovate/flyway
outductor Aug 5, 2024
a9c81cd
scalafmt
outductor Aug 5, 2024
e9db600
Merge pull request #2359 from GiganticMinecraft/hoge
outductor Aug 5, 2024
95f3ffb
chore(deps): update mikefarah/yq docker tag to v4.44.2
renovate[bot] Aug 5, 2024
35d55c8
chore(deps): update actions/checkout action to v4
renovate[bot] Aug 5, 2024
f5fb73a
Merge pull request #2361 from GiganticMinecraft/renovate/actions-chec…
outductor Aug 5, 2024
b7f4b04
Merge pull request #2360 from GiganticMinecraft/renovate/mikefarah-yq…
outductor Aug 5, 2024
dc55ba6
chore(deps): update dependency ubuntu to v22
renovate[bot] Aug 5, 2024
4b8c74b
Merge pull request #2362 from GiganticMinecraft/renovate/ubuntu-22.x
outductor Aug 5, 2024
a1df890
chore(deps): update mikefarah/yq docker tag to v4.44.3
renovate[bot] Aug 5, 2024
4472752
Merge pull request #2363 from GiganticMinecraft/renovate/mikefarah-yq…
outductor Aug 6, 2024
a27156a
Merge pull request #2305 from GiganticMinecraft/renovate/io.circe-cir…
rito528 Aug 8, 2024
a3f0895
chore(deps): update mariadb docker tag to v10.11.9
renovate[bot] Aug 12, 2024
0f8f644
chore(deps): update flyway to v10.17.1
renovate[bot] Aug 13, 2024
104d7cc
chore(deps): update dependency io.sentry:sentry to v7.14.0
renovate[bot] Aug 13, 2024
ec3722b
Merge pull request #2366 from GiganticMinecraft/renovate/io.sentry-se…
outductor Aug 16, 2024
b5213cc
Merge pull request #2365 from GiganticMinecraft/renovate/flyway
outductor Aug 16, 2024
d895377
Merge pull request #2364 from GiganticMinecraft/renovate/mariadb-10.x
outductor Aug 16, 2024
3daf915
chore(deps): update dependency com.mojang:authlib to v6.0.55
renovate[bot] Aug 18, 2024
aee4ad2
Merge pull request #2368 from GiganticMinecraft/renovate/com.mojang-a…
outductor Aug 19, 2024
fd03f11
feat: 整地報酬ガチャ券受取について右クリック用の受取バッチ処理を追加
kuroma6666 Sep 1, 2024
73249fc
feat: 整地報酬ガチャ券受取ボタンの右クリック対応
kuroma6666 Sep 1, 2024
a2298a5
update: 整地報酬ガチャ券受取ボタンのガチャ券受取枚数について説明を追加
kuroma6666 Sep 1, 2024
6feb27c
chore: コメント微修正
kuroma6666 Sep 1, 2024
47dfbe2
fix: バッチ命名の修正 RightClick->OneStack
kuroma6666 Sep 1, 2024
33f852c
fix: 引数名省略
kuroma6666 Sep 1, 2024
7143d2f
chore: ボタンlore微修正
kuroma6666 Sep 1, 2024
d538252
fix!: エデンの鯖落ちに関するサーバー参加時の警告メッセージを削除する
Lucky3028 Sep 1, 2024
bfafc88
fix: Batchで扱うガチャポイントの数を明確にするよう修正
kuroma6666 Sep 2, 2024
ac1ba33
fix: 整地報酬ガチャ券受取変数名について省略をしないよう修正 recv->receive
kuroma6666 Sep 2, 2024
a0e2309
chore(deps): update flyway to v10.17.3
renovate[bot] Sep 2, 2024
3730318
Merge pull request #2369 from GiganticMinecraft/renovate/flyway
outductor Sep 3, 2024
5316bd6
fix: 引数名の省略
kuroma6666 Sep 3, 2024
bba87bd
docs: BatchSizeのコメントを変更
kuroma6666 Sep 3, 2024
7c3fa7b
add: ガチャ券へのポイント交換にて一度に得られるガチャ券の上限変数を追加
kuroma6666 Sep 3, 2024
4d6cb2a
docs: 使うバッチ名をコメントへ明記した
kuroma6666 Sep 3, 2024
9d22203
ci: フォークしたリポジトリからのPRのときにCIが途中で失敗するのを修正
Lucky3028 Sep 3, 2024
2b6abc6
fix: useInBatch関数を定義し、`useInLargeBatch` と `useInSmallBatch`について書き換え
kuroma6666 Sep 3, 2024
b8ff4e1
Merge pull request #2373 from GiganticMinecraft/fix/ci-forked
rito528 Sep 3, 2024
65b83ae
fix; `BatchSize`型の定義とLarge/SmallBatchSizeを`BatchSize`型とする
kuroma6666 Sep 3, 2024
2823cb8
fix: コンパイルエラー修正
kuroma6666 Sep 3, 2024
9ca46ed
fix: コンパイルエラー修正
kuroma6666 Sep 3, 2024
fe735f9
fix: effect名の修正
kuroma6666 Sep 3, 2024
e0d22dc
Merge pull request #2371 from kuroma6666/update-gacha-ticket-recv-button
rito528 Sep 3, 2024
de75865
chore(deps): update dependency io.circe:circe-core to v0.14.10
renovate[bot] Sep 6, 2024
57750e0
chore(deps): update dependency io.circe:circe-parser to v0.14.10
renovate[bot] Sep 6, 2024
d2663f3
Merge pull request #2374 from GiganticMinecraft/renovate/io.circe-cir…
rito528 Sep 8, 2024
9605d79
Merge pull request #2376 from GiganticMinecraft/renovate/io.circe-cir…
rito528 Sep 8, 2024
c735057
chore(deps): update dependency io.circe:circe-generic to v0.14.10
renovate[bot] Sep 8, 2024
072766b
style: scalafmtAll
rito528 Sep 8, 2024
8b110ab
Merge pull request #2375 from GiganticMinecraft/renovate/io.circe-cir…
rito528 Sep 8, 2024
a6adbee
Merge pull request #2349 from GiganticMinecraft/renovate/commons-code…
rito528 Sep 8, 2024
9a062cc
chore(deps): update dependency org.apache.commons:commons-lang3 to v3…
renovate[bot] Sep 8, 2024
6ced1b5
Merge pull request #2355 from GiganticMinecraft/renovate/org.apache.c…
rito528 Sep 9, 2024
acc6cfd
chore(deps): update docker/dockerfile docker tag to v1.10
renovate[bot] Sep 11, 2024
02188ef
chore(deps): update flyway to v10.18.0
renovate[bot] Sep 12, 2024
f0d472c
fix: ホームポイントの削除ボタンの羊毛の色が違うのを修正
rito528 Sep 14, 2024
99f0449
Merge pull request #2378 from GiganticMinecraft/renovate/flyway
outductor Sep 15, 2024
1fc70ab
feat: パッシブスキルメニューにマナが無くなったら掘れなくするスキルのトグルボタンを追加
kuroma6666 Sep 15, 2024
09a17d6
feat: マナを消費しきった際の分岐処理を追加
kuroma6666 Sep 15, 2024
924113e
chore: V1.19.0 ブロック破壊の抑制トリガー設定を保存するマイグレーションファイルを追加
kuroma6666 Sep 15, 2024
9f45f42
feat: breakskilltriggerconfigサブシステムの追加
kuroma6666 Sep 15, 2024
e7c7cd3
feat: ブロック破壊時、「マナ切れ」かどうか判定する処理を追加
kuroma6666 Sep 15, 2024
0c77533
feat: モブ討伐総数の計算を追加
kuroma6666 Sep 15, 2024
6138dc4
feat: GBのLoreにMOB討伐総数表示欄を追加
kuroma6666 Sep 15, 2024
a6ab823
chore(deps): update dependency sbt/sbt to v1.10.2
renovate[bot] Sep 16, 2024
6725736
fix: `isBreakBlockManaFullyConsumed`を`breakskilltriggerconfig`サブシステムに実装
kuroma6666 Sep 16, 2024
c719130
sbt
outductor Sep 19, 2024
71c2e20
Merge pull request #2380 from GiganticMinecraft/renovate/sbt-sbt-1.x
outductor Sep 19, 2024
d5e1fe4
Merge pull request #2377 from GiganticMinecraft/renovate/docker-docke…
outductor Sep 19, 2024
c043e8d
fix: スキル発動分のマナ不足のとき、ブロック破壊処理を終了するようにする
kuroma6666 Sep 21, 2024
f1e0599
fix: 消費マナ不足処理の修正
kuroma6666 Sep 21, 2024
6348649
feat: 実績Noより実績小区分名を逆引きする処理を追加
kuroma6666 Sep 21, 2024
b0b2fe2
feat: ボタンクリック時と実績解除判定時に小区分名を表示する
kuroma6666 Sep 21, 2024
b84e6eb
chore: 実績の小区分を先頭に表示するようにした
kuroma6666 Sep 21, 2024
4861ad6
feat: `entryIdToGroup`から実績IDと小区分の割当を分離
kuroma6666 Sep 21, 2024
66d94e1
fix: `PlayerBlockBreakListener`へマナ切れブロック破壊停止設定取得処理を移動
kuroma6666 Sep 21, 2024
acb3cf8
fix: マナ消費できるかどうか判断する関数を修正
kuroma6666 Sep 21, 2024
9753a7a
fix: `isBreakBlockManaFullyConsumed`関数を`PlayerBlockBreakListener`へ定義
kuroma6666 Sep 22, 2024
05c80c1
chore: importするパッケージの修正
kuroma6666 Sep 22, 2024
d79bad1
fix: 消費マナ不足判定処理とブロック破壊時処理を明確にした
kuroma6666 Sep 22, 2024
ad5b883
chore: scalafmt
kuroma6666 Sep 22, 2024
02c9368
chore: `BreakSkillTriggerSettings`の削除
kuroma6666 Sep 22, 2024
58bfb1d
chore(deps): update dependency ubuntu to v24
renovate[bot] Sep 26, 2024
e51a82b
chore(deps): update flyway to v10.19.0
renovate[bot] Oct 3, 2024
243297b
chore(deps): update dependency ch.epfl.scala:sbt-scalafix to v0.13.0
renovate[bot] Oct 9, 2024
7019493
Merge pull request #2383 from GiganticMinecraft/renovate/flyway
outductor Oct 11, 2024
3a5bf09
chore(deps): update dependency org.scalikejdbc:scalikejdbc to v4.3.2
renovate[bot] Oct 11, 2024
73ccd25
Merge pull request #2386 from GiganticMinecraft/renovate/ubuntu-24.x
outductor Oct 11, 2024
3879e59
chore(deps): update dependency io.sentry:sentry to v7.15.0
renovate[bot] Oct 11, 2024
3264822
Merge pull request #2389 from GiganticMinecraft/renovate/ch.epfl.scal…
outductor Oct 11, 2024
0442eff
Merge pull request #2385 from GiganticMinecraft/renovate/org.scalikej…
outductor Oct 11, 2024
7fb0e20
Merge pull request #2391 from GiganticMinecraft/renovate/io.sentry-se…
outductor Oct 11, 2024
8627075
chore: 重複項目のloreを削除
kuroma6666 Oct 12, 2024
b393e07
fix: 倒した敵の総数を返す処理の修正
kuroma6666 Oct 12, 2024
ae8d4c2
chore: `canAcquire`のコメント修正
kuroma6666 Oct 12, 2024
914bf47
fix: 「マナがないときにスキルの発動を抑制するかどうか」のテーブル構造を修正
kuroma6666 Oct 12, 2024
eaec16e
fix `isBreakBlockManaFullyConsumed`の処理を修正
kuroma6666 Oct 12, 2024
c866139
Merge pull request #2379 from kuroma6666/feat-GBLore-mobTotalExp
rito528 Oct 12, 2024
df86061
fix: 指摘内容(*)を反映し、`onPlayerActiveSkillEvent`の処理を修正
kuroma6666 Oct 12, 2024
439bc91
chore: `getGroupNameByEntryId`にコメントを記載
kuroma6666 Oct 12, 2024
3fc0d70
fix: 実績IDとグループ名を紐づけたリストの命名修正
kuroma6666 Oct 12, 2024
b4fa1a9
fix: ビルドエラー修正
kuroma6666 Oct 12, 2024
cedfa94
chore: scalafmt
kuroma6666 Oct 12, 2024
f53aba9
fix: `getGroupNameByEntryId`から`entryIdToGroup`を削除
kuroma6666 Oct 14, 2024
90b34e1
fix: `displayGroupName`の名前取得を簡素にした
kuroma6666 Oct 14, 2024
8d21af7
chore: scalafmt
kuroma6666 Oct 14, 2024
7b856f3
chore(deps): update dependency org.jetbrains:annotations to v26
renovate[bot] Oct 14, 2024
2669f07
Merge pull request #2382 from kuroma6666/feat-display-achievements-de…
rito528 Oct 14, 2024
197b3e8
chore(deps): update flyway to v10.22.0
renovate[bot] Nov 20, 2024
0dc20f3
chore(deps): update dependency io.sentry:sentry to v7.18.1
renovate[bot] Nov 29, 2024
deb0b28
chore(deps): update dependency sbt/sbt to v1.10.6
renovate[bot] Nov 30, 2024
d8266f0
Merge pull request #2395 from GiganticMinecraft/renovate/io.sentry-se…
outductor Dec 10, 2024
bd16d3c
chore(deps): update dependency com.mojang:authlib to v6.0.57
renovate[bot] Dec 10, 2024
0699b46
sbt
outductor Dec 10, 2024
496361a
Merge pull request #2394 from GiganticMinecraft/renovate/sbt-sbt-1.x
outductor Dec 10, 2024
caf5b7c
chore(deps): update mariadb docker tag to v10.11.10
renovate[bot] Dec 10, 2024
02d6083
Merge pull request #2392 from GiganticMinecraft/renovate/flyway
outductor Dec 10, 2024
40403e3
Merge pull request #2397 from GiganticMinecraft/renovate/mariadb-10.x
outductor Dec 10, 2024
ef1f396
Merge pull request #2388 from GiganticMinecraft/renovate/org.jetbrain…
outductor Dec 10, 2024
7695fa5
chore(deps): update mikefarah/yq docker tag to v4.44.6
renovate[bot] Dec 10, 2024
5df768b
chore(deps): update dependency org.mariadb.jdbc:mariadb-java-client t…
renovate[bot] Dec 10, 2024
1bb780a
chore(deps): update docker/dockerfile docker tag to v1.12
renovate[bot] Dec 10, 2024
5d5bcd0
fix: BreakSkillTriggerConfigKey->BreakSuppressionPreferenceへcase clas…
kuroma6666 Dec 14, 2024
a4451d0
fix: `BreakSkillTriggerConfigKey`定義の削除
kuroma6666 Dec 14, 2024
38c29da
fix: `BreakSkillTrigger`->`BreakSuppressionPreference`への変更に伴うsubsyste…
kuroma6666 Dec 14, 2024
7b3c3c7
fix: `BreakSkillTrigger`->`BreakSuppressionPreference`への変更に伴うビルドエラー修正
kuroma6666 Dec 14, 2024
a10401e
fix: DBマイグレーションSQLの修正
kuroma6666 Dec 14, 2024
1680ffe
fix: `tryConsume`の削除
kuroma6666 Dec 14, 2024
95d772f
fix: `canAcuire`の修正
kuroma6666 Dec 14, 2024
f083c7d
fix: Repositoryに保存する場合の`doBreakSuppression`の初期値をドメイン定義に合わせた
kuroma6666 Dec 21, 2024
8b3c52b
fix: config名を`originalBreakStopConfig`->`isBreakSuppressionEnabled`に変更
kuroma6666 Dec 21, 2024
95bf5f4
fix: `toggleBreakSuppression`の記述を簡潔にした
kuroma6666 Dec 21, 2024
ffb920d
fix: `doBreakSuppression`を削除しreadメソッドのロジックを簡素化
kuroma6666 Dec 21, 2024
c63fff9
fix: `isBreakBlockManaFullyConsumed`を`private`に変更
kuroma6666 Dec 21, 2024
41f616d
chore: `scalafmtAll`,`scalafixAll`
kuroma6666 Dec 21, 2024
a80e826
chore: 改行修正
kuroma6666 Dec 21, 2024
1cfc829
fix: `isBreakSuppressionEnabled`の条件判定を修正
kuroma6666 Dec 21, 2024
3b84a4f
Merge pull request #2370 from kuroma6666/feat-digging-stop-mana-fully…
rito528 Dec 21, 2024
3129ff3
Merge pull request #2400 from GiganticMinecraft/renovate/docker-docke…
outductor Dec 29, 2024
21714bb
Merge pull request #2399 from GiganticMinecraft/renovate/org.mariadb.…
outductor Dec 29, 2024
21fbf38
Merge pull request #2398 from GiganticMinecraft/renovate/mikefarah-yq…
outductor Dec 29, 2024
438a19b
Merge pull request #2396 from GiganticMinecraft/renovate/com.mojang-a…
outductor Dec 29, 2024
6b9200e
chore(deps): update flyway to v11
renovate[bot] Dec 29, 2024
a68da04
chore(deps): update dependency io.sentry:sentry to v7.20.0
renovate[bot] Jan 2, 2025
64952ef
Merge pull request #2403 from GiganticMinecraft/renovate/io.sentry-se…
outductor Jan 4, 2025
21884bb
Merge pull request #2404 from GiganticMinecraft/renovate/major-flyway
outductor Jan 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
99 changes: 99 additions & 0 deletions .github/workflows/1_18.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: 1.18 build check

on:
push:
branches:
- 1_18
paths:
- src/**
- build.sbt
- .scalafix.conf
- .scalafmt.conf
- project/*
- .github/workflows/**.yml
- .github/actions/**/**.yml

jobs:
build_check:
env:
BUILD_ENVIRONMENT_IS_CI_OR_LOCAL: "CI"
runs-on: ubuntu-24.04
container: ghcr.io/giganticminecraft/seichiassist-builder-v2:1df7cf5
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Prepare build dependencies cache
uses: actions/cache@v4
env:
cache-name: cache-build-dependencies
cache-version: v-5
with:
# sbt等は$HOMEではなくユーザーディレクトリを見ているようで、
# GH Actionsでの ~ は /github/home/ に展開されるにもかかわらず
# 実際のキャッシュは /root/ 以下に配備される。
#
# /root/.ivy/cache, /root/.sbt - sbt関連のキャッシュ
# /root/.m2 - ビルドログを観察した感じprotoc等はここを利用する
# /root/.cache - cousierがscalasbt等をキャッシュするのに使っている
path: |
/root/.ivy2/cache
/root/.sbt
/root/.m2
/root/.cache
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-${{ hashFiles('**/build.sbt') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-

- name: Prepare build cache
if: github.ref != 'refs/heads/master'
uses: actions/cache@v4
env:
cache-name: cache-build
cache-version: v-5
with:
path: |
target
project/target
project/project/target
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-

# CIでのcheckoutはファイルのタイムスタンプをチェックアウト時刻に設定するため、
# そのままビルドするとlocalDependenciesにあるjarに変更が行われたと見なされ
# 不要なインクリメンタルコンパイルが走る
# タイムスタンプをコミット時刻に設定することでこれが回避できる
- name: Restore localDependencies' timestamps
# 参考: https://qiita.com/tomlla/items/219cea9dd071c8a9e147
run: |
git config --global --add safe.directory /__w/SeichiAssist/SeichiAssist
for jar in localDependencies/*.jar; do
timestamp=`git log -1 --pretty=format:'%cd' --date=format:'%Y%m%d%H%M.%S' $jar`
touch -t "$timestamp" $jar
done

# scalapbは.protoの再コンパイルの必要性を判定する際にタイムスタンプを見ているから、コミット時刻に合わせる
- name: Restore protocol timestamps
## 参考: https://qiita.com/tomlla/items/219cea9dd071c8a9e147
run: |
for proto in protocol/*.proto; do
timestamp=`git log -1 --pretty=format:'%cd' --date=format:'%Y%m%d%H%M.%S' $proto`
touch -t "$timestamp" $proto
done

- name: Check format with Scalafmt
run: ./sbt scalafmtCheckAll

- name: Check lint with Scalafix on push
run: ./sbt "scalafix --check"

- name: Test and build artifact
run: mkdir -p target/build && ./sbt assembly

- name: Clean build artifact for caching target folder
run: rm -r target/build
21 changes: 11 additions & 10 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- develop
- master

pull_request:
branches:
- develop
Expand All @@ -14,16 +13,16 @@ jobs:
build_test_and_upload:
env:
BUILD_ENVIRONMENT_IS_CI_OR_LOCAL: "CI"
runs-on: ubuntu-22.04
container: ghcr.io/giganticminecraft/seichiassist-builder:1a64049
runs-on: ubuntu-24.04
container: ghcr.io/giganticminecraft/seichiassist-builder-v2:1df7cf5
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Prepare build dependencies cache
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-build-dependencies
cache-version: v-5
Expand All @@ -47,7 +46,7 @@ jobs:

- name: Prepare build cache
if: github.ref != 'refs/heads/master'
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-build
cache-version: v-5
Expand All @@ -68,6 +67,8 @@ jobs:
- name: Restore localDependencies' timestamps
# 参考: https://qiita.com/tomlla/items/219cea9dd071c8a9e147
run: |
git config --global --add safe.directory /__w/SeichiAssist/SeichiAssist

for jar in localDependencies/*.jar; do
timestamp=`git log -1 --pretty=format:'%cd' --date=format:'%Y%m%d%H%M.%S' $jar`
touch -t "$timestamp" $jar
Expand Down Expand Up @@ -102,7 +103,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Test and build artifact
run: sbt assembly
run: mkdir -p target/build && sbt assembly

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand All @@ -125,7 +126,7 @@ jobs:

output-sha:
name: 最終コミットのSHA値を取得する
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
sha: ${{ steps.output-sha.outputs.sha }}
steps:
Expand All @@ -140,7 +141,7 @@ jobs:

create_prerelease:
name: GitHub ReleasesにPreReleaseを作成する
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: github.ref == 'refs/heads/develop'
needs:
- build_test_and_upload
Expand Down Expand Up @@ -171,7 +172,7 @@ jobs:
prerelease: true

push_artifact_to_debug_server_definition:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.ref == 'refs/heads/develop'
needs:
- build_test_and_upload
Expand Down Expand Up @@ -237,7 +238,7 @@ jobs:
avatar_url: ${{ secrets.DISCORD_AVATAR_URL }}

deploy_artifact_to_production:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.ref == 'refs/heads/master'
needs:
- build_test_and_upload
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-sql-version-duplicated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- .github/workflows/check-sql-version-duplicated-files.yml
jobs:
check:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
111 changes: 111 additions & 0 deletions .github/workflows/create_1_18_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: Create 1.18 release

on:
pull_request:
paths:
- src/**
- build.sbt
- .scalafix.conf
- .scalafmt.conf
- project/*
- .github/workflows/**.yml
- .github/actions/**/**.yml

jobs:
create_release:
runs-on: ubuntu-24.04
container: ghcr.io/giganticminecraft/seichiassist-builder-v2:1df7cf5
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Prepare build dependencies cache
uses: actions/cache@v4
env:
cache-name: cache-build-dependencies
cache-version: v-5
with:
# sbt等は$HOMEではなくユーザーディレクトリを見ているようで、
# GH Actionsでの ~ は /github/home/ に展開されるにもかかわらず
# 実際のキャッシュは /root/ 以下に配備される。
#
# /root/.ivy/cache, /root/.sbt - sbt関連のキャッシュ
# /root/.m2 - ビルドログを観察した感じprotoc等はここを利用する
# /root/.cache - cousierがscalasbt等をキャッシュするのに使っている
path: |
/root/.ivy2/cache
/root/.sbt
/root/.m2
/root/.cache
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-${{ hashFiles('**/build.sbt') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-

- name: Prepare build cache
if: github.ref != 'refs/heads/master'
uses: actions/cache@v4
env:
cache-name: cache-build
cache-version: v-5
with:
path: |
target
project/target
project/project/target
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-${{ github.ref }}-
${{ runner.os }}-build-${{ env.cache-name }}-${{ env.cache-version }}-

# CIでのcheckoutはファイルのタイムスタンプをチェックアウト時刻に設定するため、
# そのままビルドするとlocalDependenciesにあるjarに変更が行われたと見なされ
# 不要なインクリメンタルコンパイルが走る
# タイムスタンプをコミット時刻に設定することでこれが回避できる
- name: Restore localDependencies' timestamps
# 参考: https://qiita.com/tomlla/items/219cea9dd071c8a9e147
run: |
git config --global --add safe.directory /__w/SeichiAssist/SeichiAssist
for jar in localDependencies/*.jar; do
timestamp=`git log -1 --pretty=format:'%cd' --date=format:'%Y%m%d%H%M.%S' $jar`
touch -t "$timestamp" $jar
done

# scalapbは.protoの再コンパイルの必要性を判定する際にタイムスタンプを見ているから、コミット時刻に合わせる
- name: Restore protocol timestamps
## 参考: https://qiita.com/tomlla/items/219cea9dd071c8a9e147
run: |
for proto in protocol/*.proto; do
timestamp=`git log -1 --pretty=format:'%cd' --date=format:'%Y%m%d%H%M.%S' $proto`
touch -t "$timestamp" $proto
done

# sbt-assembly 2以降からディレクトリを作ってくれなくなった
- name: Build artifact
run: mkdir -p target/build && ./sbt assembly

- name: Create and push a tag
id: tag-name
# GiganticMinecraftにあるSeichiAssistリポジトリのブランチからのPRのみ実行
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
run: |
TAG_NAME=pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
git tag $TAG_NAME
git push origin $TAG_NAME
echo "value=$TAG_NAME" >> $GITHUB_OUTPUT

- name: Create release
uses: softprops/action-gh-release@v1
# GiganticMinecraftにあるSeichiAssistリポジトリのブランチからのPRのみ実行
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: target/build/SeichiAssist.jar
tag_name: ${{ steps.tag-name.outputs.value }}
draft: false

- name: Clean build artifact for caching target folder
run: rm -r target/build
16 changes: 8 additions & 8 deletions .github/workflows/create_new_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
get_branch_name:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
value: ${{ steps.job.outputs.value }}
steps:
Expand All @@ -14,7 +14,7 @@ jobs:
run: echo "value=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT

bump_version:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: get_branch_name
outputs:
old_version: ${{ steps.bump.outputs.old_version }}
Expand Down Expand Up @@ -72,21 +72,21 @@ jobs:
HEAD:${{ needs.get_branch_name.outputs.value }}

create_release:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: bump_version
steps:
- uses: actions/checkout@master
with:
# これがないとchunk_searchで引っかかってリリースのjarアップロードに失敗する
submodules: 'recursive'
submodules: "recursive"

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '8'
distribution: "temurin"
java-version: "17"

- name: build artifacts
run: sbt assembly
run: mkdir -p target/build && sbt assembly

- name: Create release
id: create_release
Expand All @@ -100,7 +100,7 @@ jobs:
prerelease: false

create_pull-request_to_master:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [get_branch_name, bump_version]
steps:
- uses: actions/checkout@master
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/publish_develop_builds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: publish develop build

on:
push:
branches:
- develop

jobs:
publish_build:
runs-on: ubuntu-24.04
steps:
- name: Publish develop build
env:
SEICHIASSIST_DOWNLOADER_TOKEN: ${{ secrets.SEICHIASSIST_DOWNLOADER_TOKEN }}
run: |
curl -s -X 'POST' 'http://localhost/publish/develop' \
-H 'accept: */*' \
-H 'Authorization: Bearer $SEICHIASSIST_DOWNLOADER_TOKEN'
Loading