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

Commit

Permalink
fix: サーババージョンの表示修正 (#795)
Browse files Browse the repository at this point in the history
* fix: サーババージョンの表示修正

* fix: versions.json、ReBuild And Reloadも修正
book000 authored Apr 29, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 85d80bc commit 620e63e
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/PaperServerTest.yml
Original file line number Diff line number Diff line change
@@ -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
@@ -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 Minecraftサーバが起動していないため、起動します。

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

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
@@ -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(),
@@ -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());
}

5 changes: 3 additions & 2 deletions src/main/resources/versions.json
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit 620e63e

Please sign in to comment.