From 2db00190c50fdced8711a2308bb55c11b102a417 Mon Sep 17 00:00:00 2001 From: "Tomachi [ICHIGO]" Date: Fri, 29 Apr 2022 18:06:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=82=B5=E3=83=BC=E3=83=90=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java b/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java index 653ab5410..f2e252d30 100644 --- a/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java +++ b/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java @@ -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()); } From 8ba3496de42d56bc2e91e56d637d77f0b60d4a4e Mon Sep 17 00:00:00 2001 From: "Tomachi [ICHIGO]" Date: Fri, 29 Apr 2022 18:28:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20versions.json=E3=80=81ReBuild=20And?= =?UTF-8?q?=20Reload=E3=82=82=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PaperServerTest.yml | 2 +- .run/buildAndTest.bat | 7 ++++--- .../java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java | 2 +- src/main/resources/versions.json | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/PaperServerTest.yml b/.github/workflows/PaperServerTest.yml index bc41975c1..edee69e70 100644 --- a/.github/workflows/PaperServerTest.yml +++ b/.github/workflows/PaperServerTest.yml @@ -30,4 +30,4 @@ jobs: uses: jaoafa/CheckPluginEnabling@v2.2 with: plugin-name: MyMaid4 - minecraft-version: 1.18.1 + minecraft-version: 1.18.2 diff --git a/.run/buildAndTest.bat b/.run/buildAndTest.bat index 4698aa4a1..fdcb0da93 100644 --- a/.run/buildAndTest.bat +++ b/.run/buildAndTest.bat @@ -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 @@ -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 ( @@ -88,7 +89,7 @@ if not %errorlevel% == 0 ( echo MinecraftT[oNĂȂ߁AN܂B cd server - %SELECTED_JAVA% -jar paper.jar -nogui + %SELECTED_JAVA% -jar paper-%PAPER_VERSION%.jar -nogui if %errorlevel% == 0 exit ) diff --git a/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java b/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java index f2e252d30..139a4818b 100644 --- a/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java +++ b/src/main/java/com/jaoafa/mymaid4/event/Event_ViaVerCheck.java @@ -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(), diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index 28ee1ac1f..1f3bb6bf8 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -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" } \ No newline at end of file