Skip to content

Commit d421ff2

Browse files
josemmojosemmo
authored
Merge pull request #97 from josemmo/develop
v1.2.11
2 parents 494e18b + 178c464 commit d421ff2

File tree

6 files changed

+118
-107
lines changed

6 files changed

+118
-107
lines changed

‎.github/workflows/tests.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
test:
77
runs-on: ubuntu-latest
88
timeout-minutes: 8
9-
continue-on-error: ${{ matrix.version == '1.19.4' }}
9+
continue-on-error: ${{ matrix.version == '1.20.1' }}
1010
strategy:
1111
fail-fast: false
1212
matrix:
1313
flavor: ['bukkit', 'spigot', 'paper', 'purpur']
14-
version: ['1.19.4', '1.18.2', '1.17.1', '1.16.5']
14+
version: ['1.20.1', '1.19.4', '1.18.2', '1.17.1', '1.16.5']
1515
steps:
1616
# Download code from repository
1717
- name: Checkout code
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup Node.js
4040
uses: actions/setup-node@v3
4141
with:
42-
node-version: '17'
42+
node-version: '19'
4343

4444
# Setup automata
4545
- name: Setup automata
@@ -67,24 +67,18 @@ jobs:
6767
wget -nv "$url" -O server.jar
6868
java -jar server.jar || true
6969
sed -i 's/eula=false/eula=true/g' eula.txt
70-
echo "online-mode=false" >> server.properties
71-
echo "enable-rcon=true" >> server.properties
72-
echo "rcon.password=rcon" >> server.properties
73-
echo "allow-nether=false" >> server.properties
74-
echo "allow-end=false" >> server.properties
70+
echo 'online-mode=false' >> server.properties
71+
echo 'enable-rcon=true' >> server.properties
72+
echo 'rcon.password=rcon' >> server.properties
73+
echo 'allow-nether=false' >> server.properties
74+
echo 'allow-end=false' >> server.properties
7575
echo 'generate-structures=false' >> server.properties
76-
echo "level-type=flat" >> server.properties
76+
echo 'level-type=flat' >> server.properties
7777
7878
# Install dependencies
7979
- name: Install plugin dependencies
80-
env:
81-
VERSION: ${{ matrix.version }}
8280
run: |
83-
if [ $VERSION == "1.19.4" ]; then
84-
url="https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar"
85-
else
86-
url="https://github.com/dmulloy2/ProtocolLib/releases/download/4.8.0/ProtocolLib.jar"
87-
fi
81+
url="https://github.com/dmulloy2/ProtocolLib/releases/download/5.0.0/ProtocolLib.jar"
8882
mkdir -p ./server/plugins/ProtocolLib
8983
wget -q "$url" -O ./server/plugins/ProtocolLib.jar
9084
echo -e "global:\n auto updater:\n notify: false\n download: false" > ./server/plugins/ProtocolLib/config.yml
@@ -102,10 +96,12 @@ jobs:
10296
# Test plugin
10397
- name: Run plugin in server
10498
working-directory: ./server
99+
env:
100+
FLAVOR: ${{ matrix.flavor }}
105101
run: |
106102
(cd ../automata && npm run start) &
107103
timeout -s SIGINT -k 110s 90s java -DIReallyKnowWhatIAmDoingISwear -jar server.jar nogui | tee server.log || true
108-
if ! grep -Fq '[YamipaPlugin] Loading YamipaPlugin' server.log; then
104+
if ! grep -Fq '[YamipaPlugin] ' server.log; then
109105
echo "Plugin did not load"
110106
exit 1
111107
fi
@@ -129,7 +125,7 @@ jobs:
129125
echo "Plugin did not remove the fake image"
130126
exit 1
131127
fi
132-
if grep -iFq 'exception' server.log; then
128+
if [ "$FLAVOR" != "bukkit" ] && grep -iFq 'exception' server.log; then
133129
echo "Server threw an exception"
134130
exit 1
135131
fi

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ Download the JAR file for the [latest release](https://github.com/josemmo/yamipa
2525
Before installing Yamipa make sure you meet the following requirements:
2626

2727
- CraftBukkit, Spigot or PaperMC 1.16 or higher
28-
- [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) v4.8.0 or higher
29-
(latest [dev build](https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/) for 1.19.4)
28+
- [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) v5.0.0 or higher
3029

3130
Here are the Minecraft distributions where Yamipa should be able to run:
3231
| Minecraft version | CraftBukkit | Spigot | PaperMC |
@@ -35,6 +34,7 @@ Here are the Minecraft distributions where Yamipa should be able to run:
3534
| 1.17 & 1.17.1 | ✅ | ✅ | ✅ |
3635
| 1.18 & 1.18.x | ✅ | ✅ | ✅ |
3736
| 1.19 & 1.19.x | ✅ | ✅ | ✅ |
37+
| 1.20 & 1.20.1 | ✅ | ✅ | ✅ |
3838

3939
## Configuration
4040
Yamipa is ready-to-go right out of the box. By default, it creates the following files and directories under the
@@ -96,16 +96,16 @@ This plugin adds the following commands:
9696
`/image clear 0 0 world 9999999 00000000-0000-0000-0000-000000000000`
9797

9898
## Permissions
99-
If you want more granular control over the players who can use a particular set of commands, permissions are the way to go!
99+
If you want more granular control over the features exposed to players, permissions are the way to go!
100100

101101
Yamipa defines the following permissions:
102102

103-
| Command | Default | Description |
103+
| Permission | Default | Description |
104104
|:----------------------------|:-----------:|:----------------------------------------------------------------|
105105
| `yamipa.command.clear` | OPs | To use the `/image clear` command |
106106
| `yamipa.command.describe` | OPs | To use the `/image describe` command |
107107
| `yamipa.command.download` | OPs | To use the `/image download` command |
108-
| `yamipa.command.give` | OPs | To use the `/image give` download |
108+
| `yamipa.command.give` | OPs | To use the `/image give` command |
109109
| `yamipa.command.list` | OPs | To use the `/image list` command |
110110
| `yamipa.command.place` | OPs | To use the `/image place` command |
111111
| `yamipa.command.remove` | OPs | To use the `/image remove` command |

0 commit comments

Comments
 (0)