Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

fix: サーババージョンの表示修正 #795

Merged
merged 2 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/PaperServerTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
uses: jaoafa/[email protected]
with:
plugin-name: MyMaid4
minecraft-version: 1.18.1
minecraft-version: 1.18.2
7 changes: 4 additions & 3 deletions .run/buildAndTest.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set PLUGIN_NAME=MyMaid4
set JAR_FILE=MyMaid4.jar
set PAPER_VERSION=1.18.2

if not exist server (
mkdir server
Expand All @@ -15,8 +16,8 @@ if not exist server\plugins (
mkdir server\plugins
)

if not exist server\paper.jar (
curl -o server\paper.jar -L "https://api.tomacheese.com/papermc/1.18.2/latest"
if not exist server\paper-%PAPER_VERSION%.jar (
curl -o server\paper-%PAPER_VERSION%.jar -L "https://api.tomacheese.com/papermc/%PAPER_VERSION%/latest"
)

if not exist server\mcrconapi-1.1.1.jar (
Expand Down Expand Up @@ -88,7 +89,7 @@ if not %errorlevel% == 0 (
echo Minecraft�T�[�o���N�����Ă��Ȃ����߁A�N�����܂��B

cd server
%SELECTED_JAVA% -jar paper.jar -nogui
%SELECTED_JAVA% -jar paper-%PAPER_VERSION%.jar -nogui
if %errorlevel% == 0 exit
)

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void run() {

String version = obj.getString(ver);

if (!version.equals("1.18.1")) {
if (!version.equals("1.18.2")) {
player.sendMessage(Component.text().append(
Component.text("[VersionChecker]"),
Component.space(),
Expand All @@ -85,13 +85,13 @@ public void run() {
player.sendMessage(Component.text().append(
Component.text("[VersionChecker]"),
Component.space(),
Component.text("サーババージョンは1.18.1のため、", NamedTextColor.AQUA),
Component.text("サーババージョンは1.18.2のため、", NamedTextColor.AQUA),
Component.text("一部のブロック・機能は利用できません。", NamedTextColor.RED)
).build());
player.sendMessage(Component.text().append(
Component.text("[VersionChecker]"),
Component.space(),
Component.text("クライアントバージョンを「1.18.1」にすることを強くお勧めします。", NamedTextColor.AQUA)
Component.text("クライアントバージョンを「1.18.2」にすることを強くお勧めします。", NamedTextColor.AQUA)
).build());
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,10 @@
"Snapshot 58": "1.18-rc2",
"Snapshot 59": "1.18-rc3",
"Snapshot 60": "1.18-rc4",
"757": "1.18.2",
"757": "1.18.1",
"Snapshot 61": "1.18.1-pre1",
"Snapshot 62": "1.18.1-rc1",
"Snapshot 63": "1.18.1-rc2",
"Snapshot 64": "1.18.1-rc3"
"Snapshot 64": "1.18.1-rc3",
"758": "1.18.2"
}