Merge pull request #50 from josemmo/develop

v1.2.4

.github/workflows/tests.yml

@@ -6,19 +6,30 @@ jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 8
-    continue-on-error: ${{ matrix.version == '1.19' }}
+    continue-on-error: ${{ matrix.version == '1.19.2' }}
     strategy:
       fail-fast: false
       matrix:
         flavor: ['bukkit', 'spigot', 'paper', 'purpur']
-        version: ['1.19', '1.18.2', '1.17.1', '1.16.5']
+        version: ['1.19.2', '1.18.2', '1.17.1', '1.16.5']
     steps:
       # Download code from repository
       - name: Checkout code
         uses: actions/checkout@v3
 
-      # Setup Java
-      - name: Setup JDK
+      # Setup Java (for building)
+      - name: Setup JDK (for building)
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      # Build plugin
+      - name: Build with Maven
+        run: mvn --batch-mode --update-snapshots verify
+
+      # Setup Java (for testing)
+      - name: Setup JDK (for testing)
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -28,17 +39,13 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '17'
 
       # Setup automata
       - name: Setup automata
         working-directory: ./automata
         run: npm install
 
-      # Build plugin
-      - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots verify
-
       # Setup server
       - name: Setup server
         env:
@@ -70,8 +77,10 @@ jobs:
 
       # Install dependencies
       - name: Install plugin dependencies
+        env:
+          VERSION: ${{ matrix.version }}
         run: |
-          if [ $VERSION == "1.19" ]; then
+          if [ $VERSION == "1.19.2" ]; then
             url="https://ci.dmulloy2.net/job/ProtocolLib/lastStableBuild/artifact/target/ProtocolLib.jar"
           else
             url="https://github.com/dmulloy2/ProtocolLib/releases/download/4.8.0/ProtocolLib.jar"
@@ -94,7 +103,7 @@ jobs:
         working-directory: ./server
         run: |
           (cd ../automata && npm run start) &
-          timeout -s SIGINT 90s java -DIReallyKnowWhatIAmDoingISwear -jar server.jar nogui | tee server.log || true
+          timeout -s SIGINT -k 110s 90s java -DIReallyKnowWhatIAmDoingISwear -jar server.jar nogui | tee server.log || true
           if ! grep -Fq '[YamipaPlugin] Loading YamipaPlugin' server.log; then
             echo "Plugin did not load"
             exit 1

README.md

@@ -33,7 +33,7 @@ Here are the Minecraft distributions where Yamipa should be able to run:
 |            1.16.x |     ✅      |   ✅    |   ✅    |
 |     1.17 & 1.17.1 |     ✅      |   ✅    |   ✅    |
 |     1.18 & 1.18.x |     ✅      |   ✅    |   ✅    |
-|              1.19 |     ✅      |   ✅    |   ✅    |
+|     1.19 & 1.19.x |     ✅      |   ✅    |   ✅    |
 
 ## Configuration
 Yamipa is ready-to-go right out of the box. By default, it creates the following files and directories under the
@@ -113,6 +113,17 @@ such as [LuckPerms](https://luckperms.net/) or [GroupManager](https://elgarl.git
 
 Both these plugins have been tested to work with Yamipa, although any similar one should work just fine.
 
+## Protecting areas
+In large servers, letting your players place and remove images wherever they want might not be the most sensible idea.
+For those cases, Yamipa is compatible with other Bukkit plugins that allow creating and managing world areas.
+If you have one or more of such plugins, Yamipa will automatically apply permissions accordingly and only let players
+place or remove images where they can place or remove blocks, no additional configuration required.
+
+The supported plugins are:
+
+- [WorldGuard](https://enginehub.org/worldguard/)
+- [GriefPrevention](https://www.spigotmc.org/resources/griefprevention.1884/)
+
 ## Flags
 Images from this plugin have a set of boolean attributes called "flags" that modify its behavior. Possible values are:
 

automata/index.js

@@ -14,7 +14,6 @@ import { getRconClient, waitForServer } from './src/rcon.js'
     const conn = await getRconClient()
     await conn.send('op test')
     await conn.send('gamemode creative test')
-    await conn.end()
     await wait(2000)
 
     console.log('[AUTOMATA] Preparing test account...')
@@ -37,5 +36,10 @@ import { getRconClient, waitForServer } from './src/rcon.js'
 
     console.log('[AUTOMATA] Logging off...')
     bot.end()
+
+    console.log('[AUTOMATA] Stopping server...')
+    await conn.send('stop')
+    await conn.end()
+
     console.log('[AUTOMATA] Done!')
 })()