[maven-release-plugin] prepare release forge-1.6.57

.github/workflows/maven-publish.yml

@@ -1,22 +1,11 @@
-name: Publish Desktop Forge
+name: Publish Forge
 
 on:
   workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-        required: false
-        default: false
-      release_android:
-        type: boolean
-        description: 'Also try to release android build'
-        required: false
-        default: false
 
 jobs:
   build:
-    if: github.repository_owner == 'Card-Forge'
+
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -25,10 +14,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
           server-id: cardforge-repo
@@ -43,94 +32,10 @@ jobs:
         run: |
           git config user.email "actions@github.com"
           git config user.name "GitHub Actions"
-
-      - name: Install old maven (3.8.1)
-        run: |
-          curl -o apache-maven-3.8.1-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-          tar xf apache-maven-3.8.1-bin.tar.gz
-          export PATH=$PWD/apache-maven-3.8.1/bin:$PATH
-          export MAVEN_HOME=$PWD/apache-maven-3.8.1
-          mvn --version    
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-
-      - name: Setup android requirements
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.release_android }}
-        run: |
-          JAVA_HOME=${JAVA_HOME_17_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;35.0.0" "platform-tools" "platforms;android-35"
-          cd forge-gui-android
-          echo "${{ secrets.FORGE_KEYSTORE }}" > forge.keystore.asc
-          gpg -d --passphrase "${{ secrets.FORGE_KEYSTORE_PASSPHRASE }}" --batch forge.keystore.asc > forge.keystore
-          cd -
-          mkdir  -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          curl -L -o android-maven-plugin-4.6.2.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.jar
-          curl -L -o android-maven-plugin-4.6.2.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.pom
-          cd -
-          mvn install -Dmaven.test.skip=true
-          mvn dependency:tree
-          
-
-      - name: Build/Install/Publish Desktop to GitHub Packages Apache Maven
-        if: ${{ github.event_name == 'workflow_dispatch' && !inputs.release_android }}
+      - name: Build/Install/Publish to GitHub Packages Apache Maven
         run: |
           export DISPLAY=":1"
           Xvfb :1 -screen 0 800x600x8 &
-          export _JAVA_OPTIONS="-Xmx2g"
-          d=$(date +%m.%d)
-          # build only desktop and only try to move desktop files
-          mvn -U -B clean -P windows-linux install -e -T 1C release:clean release:prepare release:perform -DskipTests
-          mkdir izpack
-          # move bz2 and jar from work dir to izpack dir
-          mv /home/runner/work/forge/forge/forge-installer/*/*.{bz2,jar} izpack/
-          # move desktop build.txt and version.txt to izpack
-          mv /home/runner/work/forge/forge/forge-gui-desktop/target/classes/*.txt izpack/
-          cd izpack
-          ls
-          echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
+          mvn -U -B clean -P windows-linux install release:clean release:prepare release:perform -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }}
         env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Build/Install/Publish Desktop+Android to GitHub Packages Apache Maven
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.release_android }}
-        run: |
-          export DISPLAY=":1"
-          Xvfb :1 -screen 0 800x600x8 &
-          export _JAVA_OPTIONS="-Xmx2g"
-          d=$(date +%m.%d)
-          # build both desktop and android
-          mvn -U -B clean -P windows-linux,android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0
-          mkdir izpack
-          # move bz2 and jar from work dir to izpack dir
-          mv /home/runner/work/forge/forge/forge-installer/*/*.{bz2,jar} izpack/
-          # move desktop build.txt and version.txt to izpack
-          mv /home/runner/work/forge/forge/forge-gui-desktop/target/classes/*.txt izpack/
-          # move android apk and assets.zip
-          mv /home/runner/work/forge/forge/forge-gui-android/target/*-signed-aligned.apk izpack/
-          mv /home/runner/work/forge/forge/forge-gui-android/target/assets.zip izpack/
-          cd izpack
-          ls
-          echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Upload snapshot to GitHub Prerelease
-        uses: ncipollo/release-action@v1
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          name: Release ${{ env.GIT_TAG }}
-          tag: ${{ env.GIT_TAG }}
-          artifacts: izpack/*
-          allowUpdates: true
-          removeArtifacts: true
-          makeLatest: true
-
-      - name: Send failure notification to Discord
-        if: failure() # This step runs only if the job fails
-        run: |
-          curl -X POST -H "Content-Type: application/json" \
-          -d "{\"content\": \"🔴 Release Build Failed in branch: \`${{ github.ref_name }}\` by \`${{ github.actor }}\`.\nCheck logs: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
-          ${{ secrets.DISCORD_AUTOMATION_WEBHOOK }}
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/publish-android.yml

@@ -1,89 +0,0 @@
-name: Publish Android Release
-
-on:
-  workflow_dispatch:
-      inputs:
-        debug_enabled:
-          type: boolean
-          description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-          required: false
-          default: false
-          
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      deployments: write
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: cardforge-repo
-          server-username: ${{ secrets.FTP_USERNAME }}
-          server-password: ${{ secrets.FTP_PASSWORD }}
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - name: Install old maven (3.8.1)
-        run: |
-          curl -o apache-maven-3.8.1-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-          tar xf apache-maven-3.8.1-bin.tar.gz
-          export PATH=$PWD/apache-maven-3.8.1/bin:$PATH
-          export MAVEN_HOME=$PWD/apache-maven-3.8.1
-          mvn --version
-          
-      - name: Install android SDK
-        uses: maxim-lobanov/setup-android-tools@v1
-        with:
-          packages: |
-            platforms;android-35
-            build-tools;35.0.0
-
-      - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
-        run: |
-          command -v Xvfb >/dev/null 2>&1 || { sudo apt update && sudo apt install -y xvfb; }
-          export DISPLAY=":1"
-          Xvfb :1 -screen 0 800x600x8 &
-        
-      - name: Extract Android keystore
-        run: |
-          ls
-          cd forge-gui-android
-          echo "${{ secrets.FORGE_KEYSTORE }}" > forge.keystore.asc
-          gpg -d --passphrase "${{ secrets.FORGE_KEYSTORE_PASSPHRASE }}" --batch forge.keystore.asc > forge.keystore
-          cd -
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-
-      - name: Configure Git User
-        run: |
-          git config user.email "actions@github.com"
-          git config user.name "GitHub Actions"
-
-      - name: Install Android maven plugin
-        run: |
-          mkdir  -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          curl -L -o android-maven-plugin-4.6.2.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.jar
-          curl -L -o android-maven-plugin-4.6.2.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.pom
-          #mvn install:install-file -Dfile=android-maven-plugin-4.6.2.jar -DgroupId=com.simpligility.maven.plugins -DartifactId=android-maven-plugin -Dversion=4.6.2 -Dpackaging=jar
-          cd -
-          mvn install -Dmaven.test.skip=true
-          mvn dependency:tree
-          
-      - name: Build/Install/Publish to GitHub Packages Apache Maven
-        run: |
-          export _JAVA_OPTIONS="-Xmx2g"
-          mvn -U -B -P android-release-build,android-release-upload install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-

.github/workflows/remove-stale-branches.yml

@@ -1,19 +0,0 @@
-name: Remove stale branches
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *" # Everday at midnight
-
-jobs:
-  remove-stale-branches:
-    if: github.repository_owner == 'Card-Forge'
-    name: Remove Stale Branches
-    runs-on: ubuntu-latest
-    steps:
-      - uses: fpicalausa/remove-stale-branches@v2.1.0
-        with:
-          dry-run: false # Check out the console output before setting this to false
-          ignore-unknown-authors: true
-          ignore-branches-with-open-prs: true
-          default-recipient: tehdiplomat

.github/workflows/snapshot-both-pc-android.yml

@@ -1,132 +0,0 @@
-name: Create Snapshot Desktop and Android
-
-on:
-  workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-        required: false
-        default: false
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron:  '00 18 * * *'
-
-jobs:
-  build:
-    if: github.repository_owner == 'Card-Forge'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      deployments: write
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: cardforge-repo
-          server-username: ${{ secrets.FTP_USERNAME }}
-          server-password: ${{ secrets.FTP_PASSWORD }}
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
-        run: command -v Xvfb >/dev/null 2>&1 || { sudo apt update && sudo apt install -y xvfb; }
-
-      - name: Configure Git User
-        run: |
-          git config user.email "actions@github.com"
-          git config user.name "GitHub Actions"
-
-      - name: Install old maven (3.8.1)
-        run: |
-          curl -o apache-maven-3.8.1-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-          tar xf apache-maven-3.8.1-bin.tar.gz
-          export PATH=$PWD/apache-maven-3.8.1/bin:$PATH
-          export MAVEN_HOME=$PWD/apache-maven-3.8.1
-          mvn --version
-          
-      - name: Set Up Android tools
-        run: |
-          JAVA_HOME=${JAVA_HOME_17_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;35.0.0" "platform-tools" "platforms;android-35"
-     
-      - name: Extract Android keystore
-        run: |
-          ls
-          cd forge-gui-android
-          echo "${{ secrets.FORGE_KEYSTORE }}" > forge.keystore.asc
-          gpg -d --passphrase "${{ secrets.FORGE_KEYSTORE_PASSPHRASE }}" --batch forge.keystore.asc > forge.keystore
-          cd -
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-
-      - name: Install Android maven plugin
-        run: |
-          mkdir  -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          curl -L -o android-maven-plugin-4.6.2.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.jar
-          curl -L -o android-maven-plugin-4.6.2.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.pom
-          #mvn install:install-file -Dfile=android-maven-plugin-4.6.2.jar -DgroupId=com.simpligility.maven.plugins -DartifactId=android-maven-plugin -Dversion=4.6.2 -Dpackaging=jar
-          cd -
-          mvn install -Dmaven.test.skip=true
-          mvn dependency:tree
-
-      - name: Build/Install/Publish to GitHub Packages Apache Maven
-        run: |
-          export DISPLAY=":1"
-          Xvfb :1 -screen 0 800x600x8 &
-          export _JAVA_OPTIONS="-Xmx2g"
-          d=$(date +%m.%d)
-          # build both desktop and android
-          mvn -U -B clean -P windows-linux,android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0
-          mkdir izpack
-          # move bz2 and jar from work dir to izpack dir
-          mv /home/runner/work/forge/forge/forge-installer/*/*.{bz2,jar} izpack/
-          # move desktop build.txt and version.txt to izpack
-          mv /home/runner/work/forge/forge/forge-gui-desktop/target/classes/*.txt izpack/
-          # move android apk and assets.zip
-          mv /home/runner/work/forge/forge/forge-gui-android/target/*-signed-aligned.apk izpack/
-          mv /home/runner/work/forge/forge/forge-gui-android/target/assets.zip izpack/
-          cd izpack
-          # rename files and append date
-          for file in *.jar; do
-            bname="${file%.*}"
-            echo "file renamed to ${bname}-${d}.jar"
-            mv "${bname}.jar" "${bname}-${d}.jar"
-           done
-           for file in *.bz2; do
-            # remove .bz2
-            fname="${file%.*}"
-            # remove .tar
-            bname="${fname%.*}"
-            echo "file renamed to ${bname}-${d}.tar.bz2"
-            mv "${fname}.bz2" "${bname}-${d}.tar.bz2"
-          done
-          ls
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Upload snapshot to GitHub Prerelease
-        uses: ncipollo/release-action@v1
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          name: Daily Snapshot
-          tag: daily-snapshots
-          prerelease: true
-          artifacts: izpack/*
-          allowUpdates: true
-          removeArtifacts: true
-
-      - name: Send failure notification to Discord
-        if: failure() # This step runs only if the job fails
-        run: |
-          curl -X POST -H "Content-Type: application/json" \
-          -d "{\"content\": \"🔴 Snapshot Build Failed in branch: \`${{ github.ref_name }}\` by \`${{ github.actor }}\`.\nCheck logs: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
-          ${{ secrets.DISCORD_AUTOMATION_WEBHOOK }}

.github/workflows/snapshots-android.yml

@@ -1,114 +0,0 @@
-name: Create Android Snapshot
-
-on:
-  workflow_dispatch:
-      inputs:
-        debug_enabled:
-          type: boolean
-          description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-          required: false
-          default: false
-        #upload_package:
-        #  type: boolean
-        #  description: 'Upload the completed Android package'
-        #  required: false
-        #  default: true
-
-jobs:
-  build:
-    if: github.repository_owner == 'Card-Forge'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      deployments: write
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: cardforge-repo
-          server-username: ${{ secrets.FTP_USERNAME }}
-          server-password: ${{ secrets.FTP_PASSWORD }}
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - name: Install old maven (3.8.1)
-        run: |
-          curl -o apache-maven-3.8.1-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-          tar xf apache-maven-3.8.1-bin.tar.gz
-          export PATH=$PWD/apache-maven-3.8.1/bin:$PATH
-          export MAVEN_HOME=$PWD/apache-maven-3.8.1
-          mvn --version
-          
-      - name: Set Up Android tools
-        run: |
-          JAVA_HOME=${JAVA_HOME_17_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;35.0.0" "platform-tools" "platforms;android-35"
-
-      - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
-        run: |
-          command -v Xvfb >/dev/null 2>&1 || { sudo apt update && sudo apt install -y xvfb; }
-          export DISPLAY=":1"
-          Xvfb :1 -screen 0 800x600x8 &
-        
-      - name: Extract Android keystore
-        run: |
-          ls
-          cd forge-gui-android
-          echo "${{ secrets.FORGE_KEYSTORE }}" > forge.keystore.asc
-          gpg -d --passphrase "${{ secrets.FORGE_KEYSTORE_PASSPHRASE }}" --batch forge.keystore.asc > forge.keystore
-          cd -
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-
-      - name: Configure Git User
-        run: |
-          git config user.email "actions@github.com"
-          git config user.name "GitHub Actions"
-
-      - name: Install Android maven plugin
-        run: |
-          mkdir  -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          curl -L -o android-maven-plugin-4.6.2.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.jar
-          curl -L -o android-maven-plugin-4.6.2.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.pom
-          #mvn install:install-file -Dfile=android-maven-plugin-4.6.2.jar -DgroupId=com.simpligility.maven.plugins -DartifactId=android-maven-plugin -Dversion=4.6.2 -Dpackaging=jar
-          cd -
-          mvn install -Dmaven.test.skip=true
-          mvn dependency:tree
-          
-      - name: Build/Install/Publish to GitHub Packages Apache Maven
-        run: |
-          export _JAVA_OPTIONS="-Xmx2g"
-          mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true
-          mkdir upload
-          mv /home/runner/work/forge/forge/forge-gui-android/target/*-signed-aligned.apk upload/
-          mv /home/runner/work/forge/forge/forge-gui-android/target/assets.zip upload/
-          mv /home/runner/work/forge/forge/forge-gui-android/target/classes/assets/version.txt upload/
-          cd upload
-          ls
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: 📂 Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.4
-        #if: ${{ inputs.upload_package }}
-        with:
-          server: ftp.cardforge.org
-          username: ${{ secrets.FTP_USERNAME }}
-          password: ${{ secrets.FTP_PASSWORD }}
-          local-dir: upload/
-          server-dir: downloads/dailysnapshots/
-          state-name: .ftp-deploy-android-sync-state.json
-
-      - name: Send failure notification to Discord
-        if: failure() # This step runs only if the job fails
-        run: |
-          curl -X POST -H "Content-Type: application/json" \
-          -d "{\"content\": \"🔴 Android Snapshot Build Failed in branch: \`${{ github.ref_name }}\` by \`${{ github.actor }}\`.\nCheck logs: ${{ github.run_url }}\"}" \
-          ${{ secrets.DISCORD_AUTOMATION_WEBHOOK }}

.github/workflows/snapshots-pc.yml

@@ -1,95 +0,0 @@
-name: Create Desktop Snapshot
-
-on:
-  workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-        required: false
-        default: false
-
-jobs:
-  build:
-    if: github.repository_owner == 'Card-Forge'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      deployments: write
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: cardforge-repo
-          server-username: ${{ secrets.FTP_USERNAME }}
-          server-password: ${{ secrets.FTP_PASSWORD }}
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
-        run: command -v Xvfb >/dev/null 2>&1 || { sudo apt update && sudo apt install -y xvfb; }
-
-      - name: Configure Git User
-        run: |
-          git config user.email "actions@github.com"
-          git config user.name "GitHub Actions"
-      - name: Build/Install Snapshot
-        run: |
-          export DISPLAY=":1"
-          Xvfb :1 -screen 0 800x600x8 &
-          mvn -U -B clean -P windows-linux install -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }}
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-
-      - name: Rename before upload
-        run: |
-          mkdir izpack
-          # move bz2 and jar from work dir to izpack dir
-          mv /home/runner/work/forge/forge/forge-installer/*/*.{bz2,jar} izpack/
-          # move desktop build.txt to izpack
-          mv /home/runner/work/forge/forge/forge-gui-desktop/target/classes/build.txt izpack/
-          cd izpack
-          d=$(date +%m.%d)
-          # rename files and append date
-          for file in *.jar; do
-            bname="${file%.*}"
-            echo "file renamed to ${bname}-${d}.jar"
-            mv "${bname}.jar" "${bname}-${d}.jar"
-          done
-          for file in *.bz2; do
-            # remove .bz2
-            fname="${file%.*}"
-            # remove .tar
-            bname="${fname%.*}"
-            echo "file renamed to ${bname}-${d}.tar.bz2"
-            mv "${fname}.bz2" "${bname}-${d}.tar.bz2"
-          done
-
-      - name: 📂 Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.4
-        with:
-          server: ftp.cardforge.org
-          username: ${{ secrets.FTP_USERNAME }}
-          password: ${{ secrets.FTP_PASSWORD }}
-          local-dir: izpack/
-          server-dir: downloads/dailysnapshots/
-          exclude: |
-            *.pom
-            *.repositories
-            *.xml
-
-      - name: Send failure notification to Discord
-        if: failure() # This step runs only if the job fails
-        run: |
-          curl -X POST -H "Content-Type: application/json" \
-          -d "{\"content\": \"🔴 Desktop Snapshot Build Failed in branch: \`${{ github.ref_name }}\` by \`${{ github.actor }}\`.\nCheck logs: ${{ github.run_url }}\"}" \
-          ${{ secrets.DISCORD_AUTOMATION_WEBHOOK }}

.github/workflows/test-android-build.yml

@@ -1,60 +0,0 @@
-name: Test Android build
-
-on:
-  push:
-    paths: [ 'forge-gui-android/**' ]
-  pull_request:
-    paths: [ 'forge-gui-android/**' ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      deployments: write
-      packages: write
-    strategy:
-      matrix:
-        java: [ '17' ]
-    name: Test with Java ${{ matrix.Java }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: 'temurin'
-          cache: 'maven'
-
-      - name: Install old maven (3.8.1)
-        run: |
-          curl -o apache-maven-3.8.1-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-          tar xf apache-maven-3.8.1-bin.tar.gz
-          export PATH=$PWD/apache-maven-3.8.1/bin:$PATH
-          export MAVEN_HOME=$PWD/apache-maven-3.8.1
-          mvn --version
-
-      - name: Set Up Android tools
-        run: |
-          JAVA_HOME=${JAVA_HOME_17_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;35.0.0" "platform-tools" "platforms;android-35"
-
-      - name: Install Android maven plugin
-        run: |
-          mkdir  -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2
-          curl -L -o android-maven-plugin-4.6.2.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.jar
-          curl -L -o android-maven-plugin-4.6.2.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.pom
-          #mvn install:install-file -Dfile=android-maven-plugin-4.6.2.jar -DgroupId=com.simpligility.maven.plugins -DartifactId=android-maven-plugin -Dversion=4.6.2 -Dpackaging=jar
-          cd -
-          mvn install -Dmaven.test.skip=true
-          mvn dependency:tree
-
-      - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
-        run: command -v Xvfb >/dev/null 2>&1 || { sudo apt update && sudo apt install -y xvfb; }
-
-      - name: Run build in virtual framebuffer
-        run: |
-          export DISPLAY=":1"
-          Xvfb :1 -screen 0 800x600x8 &
-          mvn -U -B -P android-test-build verify -e -T 1C -Dandroid.sdk.path=$ANDROID_SDK_ROOT -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true

.github/workflows/test-build.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '8', '11' ]
     name: Test with Java ${{ matrix.Java }}
     steps:
       - uses: actions/checkout@v3
@@ -26,4 +26,4 @@ jobs:
         run: |
           export DISPLAY=":1"
           Xvfb :1 -screen 0 800x600x8 &
-          mvn -U -B clean test
+          mvn -U -B clean -P windows-linux test

.github/workflows/test-maven-settings.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '11'
         distribution: 'temurin'
         cache: 'maven'
         server-id: cardforge-repo

.gitignore

@@ -12,7 +12,6 @@
 .settings
 .classpath
 .project
-.checkstyle
 
 # Ignore VS Code config files
 
@@ -25,8 +24,6 @@
 
 nbactions.xml
 
-# Ignore flattened pom
-.flattened-pom.xml
 
 # Ignore binaries, temp files and test output, everywhere
 

.mvn/local-settings.xml

@@ -1,6 +1,18 @@
+<!--
+    Derived from: https://stackoverflow.com/a/67002852
+-->
 <settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd">
+    <mirrors>
+        <mirror>
+            <id>4thline-repo-http-unblocker</id>
+            <mirrorOf>4thline-repo</mirrorOf>
+            <name></name>
+            <url>http://4thline.org/m2</url>
+        </mirror>
+    </mirrors>
+
     <servers>
         <server>
             <id>cardforge-repo</id>
@@ -8,4 +20,4 @@
             <password>${cardforge-repo.password}</password>
         </server>
     </servers>
-</settings>
+</settings>

CONTRIBUTING.md

@@ -1,189 +0,0 @@
-# Contributing to Forge
-
-[Official repo](https://github.com/Card-Forge/forge.git).
-
-Dev instructions here: [Getting Started](https://github.com/Card-Forge/forge/wiki) (Somewhat outdated)
-
-## Requirements / Tools
-
-- you favourite Java IDE (IntelliJ, Eclipse, VSCodium, Emacs, Vi...)
-- Java JDK 17 or later
-- Git
-- Git client (optional)
-- Maven
-- GitHub account
-- Libgdx (optional: familiarity with this library is helpful for mobile platform development)
-- Android SDK (optional: for Android releases)
-- RoboVM (optional: for iOS releases) (TBD: Current status of support by libgdx)
-
-## Project Quick Setup
-
-- Login into GitHub with your user account and fork the project.
-
-- Clone your forked project to your local machine
-
-- Go to the project location on your machine.  Run Maven to download all dependencies and build a snapshot.  Example for Windows & Linux: `mvn -U -B clean -P windows-linux install`
-
-## IntelliJ
-
-IntelliJ is the recommended IDE for Forge development. Quick start guide for [setting up the Forge project within IntelliJ](https://github.com/Card-Forge/forge/wiki/IntelliJ-setup).
-
-
-## Eclipse
-
-Eclipse includes Maven integration so a separate install is not necessary.  For other IDEs, your mileage may vary.
-At this time, Eclipse is not the recommended IDE for Forge development.
-
-### Project Setup
-
-- Follow the instructions for cloning from GitHub.  You'll need to setup an account and your SSH key.
-
-  If you are on a Windows machine you can use Putty with TortoiseGit for SSH keys.  Run puttygen.exe to generate the key -- save the private key and export
-  the OpenSSH public key.  If you just leave the dialog open, you can copy and paste the key from it to your GitHub profile under
-  "SSH keys".  Run pageant.exe and add the private key generated earlier.  TortoiseGit will use this for accessing GitHub.
-
-- Fork the Forge git repo to your GitHub account.
-
-- Clone your forked repo to your local machine.
-
-- Make sure the Java SDK is installed -- not just the JRE.  Java 17 or newer required.  If you execute `java -version` at the shell or command prompt, it should report version 17 or later.
-
-- Install Eclipse 2021-12 or later for Java.  Launch it.
-
-- Create a workspace.  Go to the workbench.  Right-click inside of Package Explorer > Import... > Maven > Existing Maven Projects > Navigate to root path of the local forge repo and
-  ensure everything is checked > Finish.
-
-- Let Eclipse run through building the project.  You may be prompted for resolving any missing Maven plugins -- accept the ones offered.  You may see errors appear in the "Problems" tab.  These should
-  be automatically resolved as plug-ins are installed and Eclipse continues the build process.  If this is the first time for some plug-in installs, Eclipse may prompt you to restart.  Do so.  Be patient
-  for this first time through.
-
-- Once everything builds, all errors should disappear.  You can now advance to Project launch.
-
-### Project Launch
-
-#### Desktop
-
-This is the standard configuration used for releasing to Windows / Linux / MacOS.
-
-- Right-click on forge-gui-desktop > Run As... > Java Application > "Main - forge.view" > Ok
-
-- The familiar Forge splash screen, etc. should appear.  Enjoy!
-
-#### Mobile (Desktop dev)
-
-This is the configuration used for doing mobile development using the Windows / Linux / MacOS front-end.  Knowledge of libgdx is helpful here.
-
-- Right-click on forge-gui-mobile-dev > Run As... > Java Application > "Main - forge.app" > Ok.
-
-- A view similar to a mobile phone should appear.  Enjoy!
-
-### Eclipse / Android SDK Integration
-
-Google no longer supports Android SDK releases for Eclipse. use IntelliJ.
-
-#### Android SDK
-
-TBD
-
-##### Windows
-
-TBD
-
-##### Linux / Mac OSX
-
-TBD
-
-#### Android Plugin for Eclipse
-
-TBD
-
-#### Android Platform
-
-In Intellij, if the SDK Manager is not already running, go to Tools > Android > Android SDK Manager.  Install the following options / versions:
-
-- Android SDK Build-tools 35.0.0
-- Android 15 (API 35) SDK Platform
-
-#### Proguard update
-
-Standalone Proguard 7.6.0 is included with the project (proguard.jar) under forge-gui-android > tools and supports up to Java 23 (latest android uses Java 17).
-
-#### Android Build
-
-TBD
-
-#### Android Deploy
-
-TBD
-
-#### Android Debugging
-
-TBD
-
-### Windows / Linux SNAPSHOT build
-
-SNAPSHOT builds can be built via the Maven integration in Eclipse.
-
-1) Create a Maven build for the forge top-level project.  Right-click on the forge project.  Run as.. > Maven build...
-   - On the Main tab, set Goals: clean install, set Profiles: windows-linux
-
-2) Run forge Maven build.  If everything built, you should see "BUILD SUCCESS" in the Console View.
-
-The resulting snapshot will be found at: forge-gui-desktop/target/forge-gui-desktop-[version]-SNAPSHOT
-
-## Card Scripting
-
-Visit [this page](https://github.com/Card-Forge/forge/wiki/Card-scripting-API) for information on scripting.
-
-Card scripting resources are found in the forge-gui/res/ path.
-
-## General Notes
-
-### Project Hierarchy
-
-Forge is divided into 4 primary projects with additional projects that target specific platform releases.  The primary projects are:
-
-- forge-ai
-- forge-core
-- forge-game
-- forge-gui
-
-The platform-specific projects are:
-
-- forge-gui-android
-- forge-gui-desktop
-- forge-gui-ios
-- forge-gui-mobile
-- forge-gui-mobile-dev
-
-#### forge-ai
-
-#### forge-core
-
-#### forge-game
-
-#### forge-gui
-
-The forge-gui project includes the scripting resource definitions in the res/ path.
-
-#### forge-gui-android
-
-Libgdx-based backend targeting Android.  Requires Android SDK and relies on forge-gui-mobile for GUI logic.
-
-#### forge-gui-desktop
-
-Java Swing based GUI targeting desktop machines.
-
-Screen layout and game logic revolving around the GUI is found here.  For example, the overlay arrows (when enabled) that indicate attackers and blockers, or the targets of the stack are defined and drawn by this.
-
-#### forge-gui-ios
-
-Libgdx-based backend targeting iOS.  Relies on forge-gui-mobile for GUI logic.
-
-#### forge-gui-mobile
-
-Mobile GUI game logic utilizing [libgdx](https://libgdx.badlogicgames.com/) library.  Screen layout and game logic revolving around the GUI for the mobile platforms is found here.
-
-#### forge-gui-mobile-dev
-
-Libgdx backend for desktop development for mobile backends.  Utilizes LWJGL.  Relies on forge-gui-mobile for GUI logic.

README.md

@@ -1,100 +1,228 @@
-# ⚔️ Forge: The Magic: The Gathering Rules Engine
+# Forge
 
-Join the **Forge community** on [Discord](https://discord.gg/HcPJNyD66a)!
+[Official repo](https://github.com/Card-Forge/forge.git).
 
-[![Test build](https://github.com/Card-Forge/forge/actions/workflows/test-build.yaml/badge.svg)](https://github.com/Card-Forge/forge/actions/workflows/test-build.yaml)
+Dev instructions here: [Getting Started](https://github.com/Card-Forge/forge/wiki) (Somewhat outdated)
 
----
+Discord channel [here](https://discord.gg/fWfNgCUNRq)
 
-## ✨ Introduction
+## Requirements / Tools
 
-**Forge** is a dynamic and open-source **Rules Engine** tailored for **Magic: The Gathering** enthusiasts. Developed by a community of passionate programmers, Forge allows players to explore the rich universe of MTG through a flexible, engaging platform. 
+- you favourite Java IDE (IntelliJ, Eclipse, VSCodium, Emacs, Vi...)
+- Java JDK 8 or later (some IDEs such as Eclipse require JDK11+, whereas the Android build currently only works with JDK8)
+- Git
+- Git client (optional)
+- Maven
+- GitHub account
+- Libgdx (optional: familiarity with this library is helpful for mobile platform development)
+- Android SDK (optional: for Android releases)
+- RoboVM (optional: for iOS releases) (TBD: Current status of support by libgdx)
 
-**Note:** Forge operates independently and is not affiliated with Wizards of the Coast.
+## Project Quick Setup
 
----
+- Login into GitHub with your user account and fork the project.
 
-## 🌟 Key Features
+- Clone your forked project to your local machine
 
-- **🌐 Cross-Platform Support:** Play on **Windows, Mac, Linux,** and **Android**.
-- **🔧 Extensible Architecture:** Built in **Java**, Forge encourages developers to contribute by adding features and cards.
-- **🎮 Versatile Gameplay:** Dive into single-player modes or challenge opponents online!
+- Go to the project location on your machine.  Run Maven to download all dependencies and build a snapshot.  Example for Windows & Linux: `mvn -U -B clean -P windows-linux install`
 
----
+## Eclipse
 
-## 🛠️ Installation Guide
+Eclipse includes Maven integration so a separate install is not necessary.  For other IDEs, your mileage may vary.
 
-### 📥 Desktop Installation
-1. **Latest Releases:** Download the latest version [here](https://github.com/Card-Forge/forge/releases/latest).
-2. **Snapshot Build:** For the latest development version, grab the `forge-gui-desktop` tarball from our [Snapshot Build](https://github.com/Card-Forge/forge/releases/tag/daily-snapshots).
-   - **Tip:** Extract to a new folder to prevent version conflicts.
-3. **User Data Management:** Previous players’ data is preserved during upgrades.
-4. **Java Requirement:** Ensure you have **Java 17 or later** installed.
+### Project Setup
 
-### 📱 Android Installation
-- Download the **APK** from the [Snapshot Build](https://github.com/Card-Forge/forge/releases/tag/daily-snapshots). On the first launch, Forge will automatically download all necessary assets.
+- Follow the instructions for cloning from GitHub.  You'll need to setup an account and your SSH key.
 
----
+  If you are on a Windows machine you can use Putty with TortoiseGit for SSH keys.  Run puttygen.exe to generate the key -- save the private key and export
+  the OpenSSH public key.  If you just leave the dialog open, you can copy and paste the key from it to your GitHub profile under
+  "SSH keys".  Run pageant.exe and add the private key generated earlier.  TortoiseGit will use this for accessing GitHub.
 
-## 🎮 Modes of Play
+- Fork the Forge git repo to your GitHub account.
 
-Forge offers various exciting gameplay options:
+- Clone your forked repo to your local machine.
 
-### 🌍 Adventure Mode
-Embark on a thrilling single-player journey where you can:
-- Explore an overworld map.
-- Challenge diverse AI opponents.
-- Collect cards and items to boost your abilities.
+- Make sure the Java SDK is installed -- not just the JRE.  Java 8 or newer required.  If you execute `java -version` at the shell or command prompt, it should report version 1.8 or later.
 
-![Adventure Mode](https://downloads.cardforge.org/images/site/adventure-mode.png "Adventure Mode")
+- Install Eclipse 2018-12 or later for Java.  Launch it.
 
-### 🔍 Quest Modes
-Engage in focused gameplay without the overworld exploration—perfect for quick sessions!
+- Create a workspace.  Go to the workbench.  Right-click inside of Package Explorer > Import... > Maven > Existing Maven Projects > Navigate to root path of the local forge repo and
+  ensure everything is checked > Finish.
 
-### 🤖 AI Formats
-Test your skills against AI in multiple formats:
-- **Sealed**
-- **Draft**
-- **Commander**
-- **Cube**
+- Let Eclipse run through building the project.  You may be prompted for resolving any missing Maven plugins -- accept the ones offered.  You may see errors appear in the "Problems" tab.  These should
+  be automatically resolved as plug-ins are installed and Eclipse continues the build process.  If this is the first time for some plug-in installs, Eclipse may prompt you to restart.  Do so.  Be patient
+  for this first time through.
 
-For comprehensive gameplay instructions, visit our [Gameplay Guide](https://github.com/Card-Forge/forge/wiki/Gameplay-Guide).
+- Once everything builds, all errors should disappear.  You can now advance to Project launch.
 
----
+### Project Launch
 
-## 💬 Support & Community
+#### Desktop
 
-Need help? Join our vibrant Discord community! 
-- 📜 Read the **#rules** and explore the **FAQ**.
-- ❓ Ask your questions in the **#help** channel for assistance.
+This is the standard configuration used for releasing to Windows / Linux / MacOS.
 
----
+- Right-click on forge-gui-desktop > Run As... > Java Application > "Main - forge.view" > Ok
 
-## 🤝 Contributing to Forge
+- The familiar Forge splash screen, etc. should appear.  Enjoy!
 
-We love community contributions! Interested in helping? Check out our [Contributing Guidelines](CONTRIBUTING.md) for details on how to get started.
+#### Mobile (Desktop dev)
 
----
+This is the configuration used for doing mobile development using the Windows / Linux / MacOS front-end.  Knowledge of libgdx is helpful here.
 
-## ℹ️ About Forge
+- Right-click on forge-gui-mobile-dev > Run As... > Java Application > "Main - forge.app" > Ok.
 
-Forge aims to deliver an immersive and customizable Magic: The Gathering experience for fans around the world. 
+- A view similar to a mobile phone should appear.  Enjoy!
 
-### 📊 Repository Statistics
+### Eclipse / Android SDK Integration
 
-| Metric         | Count                                                       |
-|----------------|-------------------------------------------------------------|
-| **⭐ Stars:**   | [![GitHub stars](https://img.shields.io/github/stars/Card-Forge/forge?style=flat-square)](https://github.com/Card-Forge/forge/stargazers) |
-| **🍴 Forks:**   | [![GitHub forks](https://img.shields.io/github/forks/Card-Forge/forge?style=flat-square)](https://github.com/Card-Forge/forge/network) |
-| **👥 Contributors:** | [![GitHub contributors](https://img.shields.io/github/contributors/Card-Forge/forge?style=flat-square)](https://github.com/Card-Forge/forge/graphs/contributors) |
+Google no longer supports Android SDK releases for Eclipse.  That said, it is still possible to build and debug Android platforms.
 
----
+#### Android SDK
 
-**📄 License:** [GPL-3.0](LICENSE)
-<div align="center" style="display: flex; align-items: center; justify-content: center;">
-    <div style="margin-left: auto;">
-        <a href="#top">
-            <img src="https://img.shields.io/badge/Back%20to%20Top-000000?style=for-the-badge&logo=github&logoColor=white" alt="Back to Top">
-        </a>
-    </div>
-</div>
+Reference SO for obtaining a specific release: https://stackoverflow.com/questions/27043522/where-can-i-download-an-older-version-of-the-android-sdk
+
+##### Windows
+
+Download the following archived version of the Android SDK: http://dl-ssl.google.com/android/repository/tools_r25.2.3-windows.zip. Install it somewhere on your machine.  This is referenced
+in the following instructions as your 'Android SDK Install' path.
+
+##### Linux / Mac OSX
+
+TBD
+
+#### Android Plugin for Eclipse
+
+Google's last plugin release does not work completely with target's running Android 7.0 or later.  Download the ADT-24.2.0-20160729.zip plugin
+from: https://github.com/khaledev/ADT/releases
+
+In Eclipse go to: Help > Install New Software... > Add > Name: ADT Update, Click on the "Archive:" button and navigate to the downloaded ADT-24.2.0-20160729.zip file > Add.  Install all "Developer Tools".  Eclipse
+should restart and prompt you to run the SDK Manager.  Launch it and continue to the next steps below.
+
+#### Android Platform
+
+In Eclipse, if the SDK Manager is not already running, go to Window > Android SDK Manager.  Install the following options / versions:
+
+- Android SDK Build-tools 26.0.1
+- Android 8.0.0 (API 26) SDK Platform
+- Google USB Driver (in case your phone is not detected by ADB)
+
+Note that this will populate additional tools in the Android SDK install path extracted above.
+
+#### Proguard update
+
+The Proguard included with the Android SDK Build-tools is outdated and does not work with Java 1.8.  Download Proguard 6.0.3 or later (last tested with 7.0.1) from https://github.com/Guardsquare/proguard
+- Go to the Android SDK install path.  Rename the tools/proguard/ path to tools/proguard-4.7/.
+
+- Extract your Proguard version to the Android SDK install path under tools/.  You will need to either rename the dir proguard-<your-version> to proguard/ or, if your filesystem supports it, use a symbolic link (the later is highly recommended), such as `ln -s proguard proguard-<your-version>`.
+
+#### Android Build
+
+The Eclipse plug-ins do NOT support building things for Android.  They do however allow you to use the debugger so you can still set breakpoints and trace
+things out.  The steps below show how to generate a debug Android build.
+
+1) Create a Maven build for the forge top-level project.  Right-click on the forge project.  Run as.. > Maven build...
+   - On the Main tab, set Goals: clean install
+
+2) Run forge Maven build.  If everything built, you should see "BUILD SUCCESS" in the Console View.
+
+3) Right-click on the forge-gui-android project.  Run as.. > Maven build...
+
+   - On the Main tab, set Goals: install, Profiles: android-debug
+   - On the Environment tab, you may need to define the variable ANDROID_HOME with the value containing the path to your Android SDK installation.  For example, Variable: ANDROID_HOME, Value: Your Android SDK install path here.
+
+4) Run the forge-gui-android Maven build.  This may take a few minutes.  If everything worked, you should see "BUILD SUCCESS" in the Console View.
+
+Assuming you got this far, you should have an Android forge-android-[version].apk in the forge-gui-android/target path.
+
+#### Android Deploy
+
+You'll need to have the Android SDK install path platform-tools/ path in your command search path to easily deploy builds.
+
+- Open a command prompt.  Navigate to the forge-gui-android/target/ path.
+
+- Connect your Android device to your dev machine.
+
+- Ensure the device is visible using `adb devices`
+
+- Remove the old Forge install if present: `adb uninstall forge.app`
+
+- Install the new apk: `adb install forge-android-[version].apk`
+
+#### Android Debugging
+
+Assuming the apk is installed, launch it from the device.
+
+In Eclipse, launch the DDMS.  Window > Perspective > Open Perspective > Other... > DDMS.  You should see the forge app in the list.  Highlight the app, click on the green debug button and a
+green debug button should appear next to the app's name.  You can now set breakpoints and step through the source code.
+
+### Windows / Linux SNAPSHOT build
+
+SNAPSHOT builds can be built via the Maven integration in Eclipse.
+
+1) Create a Maven build for the forge top-level project.  Right-click on the forge project.  Run as.. > Maven build...
+   - On the Main tab, set Goals: clean install, set Profiles: windows-linux
+
+2) Run forge Maven build.  If everything built, you should see "BUILD SUCCESS" in the Console View.
+
+The resulting snapshot will be found at: forge-gui-desktop/target/forge-gui-desktop-[version]-SNAPSHOT
+
+## IntelliJ
+
+Quick start guide for [setting up the Forge project within IntelliJ](https://github.com/Card-Forge/forge/wiki/IntelliJ-setup).
+
+## Card Scripting
+
+Visit [this page](https://github.com/Card-Forge/forge/wiki/Card-scripting-API) for information on scripting.
+
+Card scripting resources are found in the forge-gui/res/ path.
+
+## General Notes
+
+### Project Hierarchy
+
+Forge is divided into 4 primary projects with additional projects that target specific platform releases.  The primary projects are:
+
+- forge-ai
+- forge-core
+- forge-game
+- forge-gui
+
+The platform-specific projects are:
+
+- forge-gui-android
+- forge-gui-desktop
+- forge-gui-ios
+- forge-gui-mobile
+- forge-gui-mobile-dev
+
+#### forge-ai
+
+#### forge-core
+
+#### forge-game
+
+#### forge-gui
+
+The forge-gui project includes the scripting resource definitions in the res/ path.
+
+#### forge-gui-android
+
+Libgdx-based backend targeting Android.  Requires Android SDK and relies on forge-gui-mobile for GUI logic.
+
+#### forge-gui-desktop
+
+Java Swing based GUI targeting desktop machines.
+
+Screen layout and game logic revolving around the GUI is found here.  For example, the overlay arrows (when enabled) that indicate attackers and blockers, or the targets of the stack are defined and drawn by this.
+
+#### forge-gui-ios
+
+Libgdx-based backend targeting iOS.  Relies on forge-gui-mobile for GUI logic.
+
+#### forge-gui-mobile
+
+Mobile GUI game logic utilizing [libgdx](https://libgdx.badlogicgames.com/) library.  Screen layout and game logic revolving around the GUI for the mobile platforms is found here.
+
+#### forge-gui-mobile-dev
+
+Libgdx backend for desktop development for mobile backends.  Utilizes LWJGL.  Relies on forge-gui-mobile for GUI logic.

adventure-editor/pom.xml

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>forge</artifactId>
-        <groupId>forge</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>adventure-editor</artifactId>
-    <packaging>jar</packaging>
-    <name>Adventure Editor</name>
-
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${project.basedir}</directory>
-                <includes>
-                    <include>**/gear.gif</include>
-                </includes>
-            </resource>
-        </resources>
-        <finalName>adventure-editor</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <basedir>${basedir}/${configSourceDirectory}</basedir>
-                    <filesToInclude>adventure-editor.sh, adventure-editor.command, adventure-editor.cmd</filesToInclude>
-                    <outputBasedir>${project.build.directory}</outputBasedir>
-                    <outputDir>.</outputDir>
-                    <regex>false</regex>
-                    <replacements>
-                        <replacement>
-                            <token>$project.build.finalName$</token>
-                            <value>${project.build.finalName}-jar-with-dependencies.jar</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <plugin>
-
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <attach>false</attach>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <mainClass>forge.adventure.Main</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <SplashScreen-Image>splash/gear.gif</SplashScreen-Image>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <!-- this is used for inheritance merges -->
-                        <phase>package</phase>
-                        <!-- bind to the packaging phase -->
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>forge</groupId>
-            <artifactId>forge-gui</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>forge</groupId>
-            <artifactId>forge-gui-mobile</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>26.0.1</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-</project>

adventure-editor/src/main/config/adventure-editor.cmd

@@ -1,24 +0,0 @@
-@echo off
-
-pushd %~dp0
-
-java -version 1>nul 2>nul || (
-   echo no java installed
-   popd
-   exit /b 2
-)
-for /f tokens^=2^ delims^=.-_^+^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j"
-
-if %jver% LEQ 16 (
-   echo unsupported java
-   popd
-   exit /b 2
-)
-
-if %jver% GEQ 17 (
-  java -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
-  popd
-  exit /b 0
-)
-
-popd

adventure-editor/src/main/java/forge/adventure/editor/ActionEditor.java

@@ -1,144 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.DialogData;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JToolBar;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionListener;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class ActionEditor extends JComponent {
-    DefaultListModel<DialogData.ActionData> model = new DefaultListModel<>();
-    JList<DialogData.ActionData> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    ActionEdit edit = new ActionEdit();
-    boolean updating;
-
-
-    public class RewardDataRenderer extends DefaultListCellRenderer {
-        @Override
-        public Component getListCellRendererComponent(
-                JList list, Object value, int index,
-                boolean isSelected, boolean cellHasFocus) {
-            JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if (!(value instanceof DialogData.ActionData))
-                return label;
-            /*DialogData.ActionData action=(DialogData.ActionData) value;
-            StringBuilder builder=new StringBuilder();
-            if(action.type==null||action.type.isEmpty())
-                builder.append("Action");
-            else
-                builder.append(action.type);*/
-            label.setText("Action");
-            return label;
-        }
-    }
-
-    public void addButton(String name, ActionListener action) {
-        JButton newButton = new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-
-    public ActionEditor() {
-
-        list.setCellRenderer(new RewardDataRenderer());
-        list.addListSelectionListener(e -> ActionEditor.this.updateEdit());
-        addButton("add", e -> ActionEditor.this.addAction());
-        addButton("remove", e -> ActionEditor.this.remove());
-        addButton("copy", e -> ActionEditor.this.copy());
-        BorderLayout layout = new BorderLayout();
-        setLayout(layout);
-        add(list, BorderLayout.LINE_START);
-        add(toolBar, BorderLayout.PAGE_START);
-        add(edit, BorderLayout.CENTER);
-
-
-        edit.addChangeListener(e -> emitChanged());
-    }
-
-    protected void emitChanged() {
-        if (updating)
-            return;
-        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
-        if (listeners != null && listeners.length > 0) {
-            ChangeEvent evt = new ChangeEvent(this);
-            for (ChangeListener listener : listeners) {
-                listener.stateChanged(evt);
-            }
-        }
-    }
-
-    private void copy() {
-
-        int selected = list.getSelectedIndex();
-        if (selected < 0)
-            return;
-        DialogData.ActionData data = new DialogData.ActionData(model.get(selected));
-        model.add(model.size(), data);
-    }
-
-    private void updateEdit() {
-
-        int selected = list.getSelectedIndex();
-        if (selected < 0)
-            return;
-        edit.setCurrentAction(model.get(selected));
-    }
-
-    void addAction() {
-        DialogData.ActionData data = new DialogData.ActionData();
-        model.add(model.size(), data);
-    }
-
-    void remove() {
-        int selected = list.getSelectedIndex();
-        if (selected < 0)
-            return;
-        model.remove(selected);
-    }
-
-    public void setAction(DialogData.ActionData[] actions) {
-
-        model.clear();
-        if (actions == null)
-            return;
-        for (int i = 0; i < actions.length; i++) {
-            if (actions[i].grantRewards.length > 0) {
-                continue; //handled in separate editor and joined in on save, will get duplicated if it appears here
-            }
-            model.add(i, actions[i]);
-        }
-    }
-
-    public DialogData.ActionData[] getAction() {
-
-        DialogData.ActionData[] action = new DialogData.ActionData[model.getSize()];
-        for (int i = 0; i < model.getSize(); i++) {
-            action[i] = model.get(i);
-        }
-        return action;
-    }
-
-    public void clear() {
-        updating = true;
-        model.clear();
-        updating = false;
-    }
-
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-}

adventure-editor/src/main/java/forge/adventure/editor/EditorMainWindow.java

@@ -1,97 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.util.Config;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JToolBar;
-import javax.swing.UIManager;
-import java.awt.BorderLayout;
-import java.awt.Desktop;
-import java.awt.EventQueue;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.security.CodeSource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class EditorMainWindow extends JFrame {
-    public final static WorldEditor worldEditor = new WorldEditor();
-    JTabbedPane tabs = new JTabbedPane();
-
-    public EditorMainWindow(Config config) {
-        UIManager.LookAndFeelInfo[] var1 = UIManager.getInstalledLookAndFeels();
-
-        for (UIManager.LookAndFeelInfo info : var1) {
-            if ("Nimbus".equals(info.getName())) {
-                try {
-                    UIManager.setLookAndFeel(info.getClassName());
-                } catch (Throwable ignored) {
-                }
-                break;
-            }
-        }
-        this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-        this.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                setVisible(false);
-                System.exit(0);
-            }
-        });
-        BorderLayout layout = new BorderLayout();
-        JToolBar toolBar = new JToolBar("toolbar");
-        JButton newButton = new JButton("GDX Particle Editor Tool");
-        newButton.addActionListener(e -> EventQueue.invokeLater(() -> {
-            newButton.setEnabled(false);
-            try {
-                CodeSource codeSource = EditorMainWindow.class.getProtectionDomain().getCodeSource();
-                File jarFile = new File(codeSource.getLocation().toURI().getPath());
-                String jarDir = jarFile.getParentFile().getPath();
-                Desktop.getDesktop().open(new File(jarDir + "/gdx-particle-editor.jar"));
-            } catch (Exception ex) {
-                new ErrorDialog("Error", ex.getMessage());
-                newButton.setEnabled(true);
-            }
-        }));
-        JButton quit = new JButton("Quit");
-        quit.addActionListener(e -> System.exit(0));
-        toolBar.add(newButton);
-        toolBar.add(quit);
-        setLayout(layout);
-        toolBar.setFloatable(false);
-        add(toolBar, BorderLayout.NORTH);
-        add(tabs, BorderLayout.CENTER);
-        tabs.addTab("World", worldEditor);
-        tabs.addTab("POI", new PointOfInterestEditor());
-        tabs.addTab("Items", new ItemsEditor());
-        tabs.addTab("Enemies", new EnemyEditor());
-        tabs.addTab("Quests", new QuestEditor());
-        setSize(config.getSettingData().width, config.getSettingData().height);
-        setLocationRelativeTo(null);
-        setVisible(true);
-    }
-
-    static class ErrorDialog {
-        public ErrorDialog(String title, String message) {
-            List<Object> options = new ArrayList<>();
-            JButton ok = new JButton("OK");
-            options.add(ok);
-            JOptionPane pane = new JOptionPane(message, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options.toArray());
-            JDialog dlg = pane.createDialog(JOptionPane.getRootFrame(), title);
-            ok.addActionListener(e -> {
-                dlg.setVisible(false);
-                System.exit(0);
-            });
-            dlg.setResizable(false);
-            dlg.setVisible(true);
-        }
-    }
-}

adventure-editor/src/main/java/forge/adventure/editor/QuestStageEdit.java

@@ -1,779 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.*;
-import forge.adventure.util.AdventureQuestController;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.*;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class QuestStageEdit extends FormPanel {
-    private boolean updating=false;
-    AdventureQuestStage currentData;
-    AdventureQuestData currentQuestData;
-    public JTextField name=new JTextField("", 25);
-    public JTextField description=new JTextField("", 25);
-    public TextListEdit itemNames =new TextListEdit();
-    public TextListEdit spriteNames =new TextListEdit();
-    public TextListEdit equipNames =new TextListEdit();
-    public TextListEdit prerequisites =new TextListEdit(currentQuestData!=null?(String[])Arrays.stream(currentQuestData.stages).filter(q -> !q.equals(currentData)).toArray():new String[]{}); //May not be the right way to do this, will come back to it.
-
-    JTabbedPane tabs =new JTabbedPane();
-    DialogEditor prologueEditor = new DialogEditor();
-    DialogEditor epilogueEditor = new DialogEditor();
-
-    public QuestStageEdit()
-    {
-        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        add(getInfoTab());
-        add(tabs);
-        tabs.add("Objective", getObjectiveTab());
-        tabs.add("Prologue",getPrologueTab());
-        tabs.add("Epilogue",getEpilogueTab());
-        tabs.add("Prerequisites",getPrereqTab());
-
-        //temp
-        nyi.setForeground(Color.red);
-        //
-
-        addListeners();
-    }
-
-    public JPanel getInfoTab(){
-        JPanel infoTab = new JPanel();
-        FormPanel center=new FormPanel();
-        center.add("name:",name);
-        center.add("description:",description);
-        name.setSize(400, name.getHeight());
-        description.setSize(400, description.getHeight());
-        infoTab.add(center);
-        name.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        description.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        prerequisites.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        return infoTab;
-    }
-
-    public JPanel getPrologueTab(){
-        JPanel prologueTab = new JPanel();
-        prologueTab.setLayout(new BoxLayout(prologueTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(prologueEditor);
-        prologueTab.add(center);
-        return prologueTab;
-    }
-
-    public JPanel getEpilogueTab(){
-        JPanel epilogueTab = new JPanel();
-        epilogueTab.setLayout(new BoxLayout(epilogueTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(epilogueEditor);
-        epilogueTab.add(center);
-        return epilogueTab;
-    }
-
-    private JComboBox<AdventureQuestController.ObjectiveTypes> objectiveType;
-
-    private final JLabel nyi = new JLabel("Not yet implemented");
-    private final JTextField deliveryItem=new JTextField(25);
-    private final JTextField mapFlag = new JTextField(25);
-
-    private Box mapFlagGroup;
-    private final JSpinner flagSpinner = new JSpinner(new SpinnerNumberModel(1, 1, 1000, 1));
-    private Box flagValueGroup;
-    private final JRadioButton anyPOI = new JRadioButton("Any Point of Interest matching tags is valid");
-    private final JRadioButton specificPOI = new JRadioButton("Only a specific Point of Interest is valid");
-    private final ButtonGroup anyPOIGroup = new ButtonGroup();
-    private final JCheckBox here = new JCheckBox("Use current map instead of selecting tags");
-    private final JCheckBox mixedEnemies = new JCheckBox("Mixture of enemy types matching");
-    private final JLabel count1Description = new JLabel("(Count 1 description)");
-    private final JLabel count2Description = new JLabel("(Count 2 description)");
-    private final JLabel count3Description = new JLabel("(Count 3 description)");
-    private final JLabel count4Description = new JLabel("(Count 4 description)");
-    private final JSpinner count1Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
-    private final JSpinner count2Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
-    private final JSpinner count3Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
-    private final JSpinner count4Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
-
-    private final JLabel arenaLabel = new JLabel("Enter the arena and prove your worth. (Note: Please be sure the PoIs selected have an arena)");
-    private final JLabel characterFlagLabel = new JLabel("Have the selected character flag set to a given value. (Caution: You're probably looking for QuestFlag or MapFlag instead)");
-    private final JLabel clearLabel = new JLabel("Clear all enemies from the target area.");
-    private final JLabel completeQuestLabel = new JLabel("Complete other quests issued by target POI. Primarily used for busy work as a part of storyline quests.");
-    private final JLabel defeatLabel = new JLabel("Defeat a number of enemies of the indicated type.");
-    private final JLabel deliveryLabel = new JLabel("Travel to the given destination to deliver an item (not tracked in inventory).");
-    private final JLabel escortLabel = new JLabel("Protect your target as they travel to their destination.");
-    private final JLabel eventFinishLabel = new JLabel("Finish (win or lose) tavern events");
-    private final JLabel eventWinLabel = new JLabel("Finish and win tavern events");
-    private final JLabel eventWinMatchLabel = new JLabel("Win individual matches in tavern events");
-    private final JLabel fetchLabel = new JLabel("Obtain the requested items (not tracked in inventory).");
-    private final JLabel findLabel = new JLabel("Locate the and enter a PoI.");
-    private final JLabel gatherLabel = new JLabel("Have the requested item in your inventory (tracked in inventory)");
-    private final JLabel giveLabel = new JLabel("Have the requested items removed from your inventory.");
-    private final JLabel haveReputationLabel = new JLabel("Have a minimum reputation in the selected PoI");
-    private final JLabel haveReputationInCurrentLocationLabel = new JLabel("Have a minimum reputation in the selected PoI (and be in it)");
-    private final JLabel huntLabel = new JLabel("Track down and defeat your target (on the overworld map).");
-    private final JLabel leaveLabel = new JLabel("Exit the current PoI and return to the overworld map.");
-    private final JLabel mapFlagLabel = new JLabel("Have a map flag set to a minimum value");
-    private final JLabel noneLabel = new JLabel("No visible objective. Use in coordination with hidden parallel objectives to track when to progress");
-    private final JLabel patrolLabel = new JLabel("Get close to generated coordinates before starting your next objective");
-    private final JLabel rescueLabel = new JLabel("Reach and rescue the target");
-    private final JLabel siegeLabel = new JLabel("Travel to the target location and defeat enemies attacking it");
-    private final JLabel questFlagLabel = new JLabel("Have a global quest flag set to a minimum value");
-    private final JLabel travelLabel = new JLabel("Travel to the given destination.");
-    private final JLabel useLabel = new JLabel("Use the indicated item from your inventory.");
-    private JTabbedPane poiPane = new JTabbedPane();
-    private final QuestTagSelector poiSelector = new QuestTagSelector("Destination Tags", false,true);
-    private final QuestTagSelector enemySelector = new QuestTagSelector("Enemy Tags", true,false);
-    private final JTextField poiTokenInput = new JTextField(25);
-
-    private final JLabel poiTokenLabel = new JLabel();
-    private final JLabel poiTokenDescription = new JLabel(
-                 "At the bottom of many objectives involving a PoI, you will see a text field in the format of '$poi_#'." +
-                 "Enter that tag here to ignore the PoI tag selector of this stage and instead use the same PoI that was selected " +
-                 "for that stage as the target PoI for this one as well.");
-
-    private void hideAllControls(){
-        arenaLabel.setVisible(false);
-        clearLabel.setVisible(false);
-        deliveryLabel.setVisible(false);
-        defeatLabel.setVisible(false);
-        escortLabel.setVisible(false);
-        fetchLabel.setVisible(false);
-        findLabel.setVisible(false);
-        gatherLabel.setVisible(false);
-        giveLabel.setVisible(false);
-        haveReputationLabel.setVisible(false);
-        huntLabel.setVisible(false);
-        leaveLabel.setVisible(false);
-        noneLabel.setVisible(false);
-        patrolLabel.setVisible(false);
-        rescueLabel.setVisible(false);
-        siegeLabel.setVisible(false);
-        mapFlagLabel.setVisible(false);
-        questFlagLabel.setVisible(false);
-        travelLabel.setVisible(false);
-        useLabel.setVisible(false);
-        deliveryItem.setVisible(false);
-        mapFlagGroup.setVisible(false);
-        flagValueGroup.setVisible(false);
-        anyPOI.setVisible(false);
-        specificPOI.setVisible(false);
-        here.setVisible(false);
-        mixedEnemies.setVisible(false);
-        enemySelector.setVisible(false);
-        count1Description.setVisible(false);
-        count2Description.setVisible(false);
-        count3Description.setVisible(false);
-        count4Description.setVisible(false);
-        count1Spinner.setVisible(false);
-        count2Spinner.setVisible(false);
-        count3Spinner.setVisible(false);
-        count4Spinner.setVisible(false);
-        poiPane.setVisible(false);
-        poiTokenLabel.setVisible(false);
-        nyi.setVisible(false);
-    }
-    private void switchPanels(){
-        hideAllControls();
-        if (objectiveType.getSelectedItem() == null){
-            return;
-        }
-        switch(objectiveType.getSelectedItem().toString()){
-            case "Arena":
-                arenaLabel.setVisible(true);
-                poiPane.setVisible(true);
-                count3Description.setText("Arena tournaments to win (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                count4Description.setText("Fail after tournaments not won (only applied if > 0)");
-                count4Description.setVisible(true);
-                count4Spinner.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "CharacterFlag":
-                characterFlagLabel.setVisible(true);
-                nyi.setVisible(true);
-                mapFlagGroup.setVisible(true);
-                flagValueGroup.setVisible(true);
-                break;
-            case "Clear":
-                clearLabel.setVisible(true);
-                poiPane.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "CompleteQuest":
-                completeQuestLabel.setVisible(true);
-                poiPane.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Number of quests to complete (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "Defeat":
-                defeatLabel.setVisible(true);
-                mixedEnemies.setVisible(true);
-                count3Description.setText("Matches to win");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                count4Description.setText("Fail after matches not won (only applied if > 0)");
-                count4Description.setVisible(true);
-                count4Spinner.setVisible(true);
-                enemySelector.setVisible(true);
-                break;
-            case "Delivery":
-                deliveryLabel.setVisible(true);
-                nyi.setVisible(true);
-                poiPane.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                deliveryItem.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "Escort":
-                escortLabel.setVisible(true);
-                nyi.setVisible(true);
-                poiPane.setVisible(true);
-                here.setVisible(true);
-                spriteNames.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "EventFinish":
-                eventFinishLabel.setVisible(true);
-                poiPane.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Events to complete (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "EventWin":
-                eventWinLabel.setVisible(true);
-                poiPane.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Events to win (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                count4Description.setText("Fail after events not won (only applied if > 0)");
-                count4Description.setVisible(true);
-                count4Spinner.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "EventWinMatch":
-                eventWinMatchLabel.setVisible(true);
-                poiPane.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Event matches to win (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                count4Description.setText("Fail after matches not won (only applied if > 0)");
-                count4Description.setVisible(true);
-                count4Spinner.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "Fetch":
-                fetchLabel.setVisible(true);
-                nyi.setVisible(true);
-                poiPane.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                deliveryItem.setVisible(true);
-                enemySelector.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "Find":
-                findLabel.setVisible(true);
-                nyi.setVisible(true);
-                poiPane.setVisible(true);
-                anyPOI.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                break;
-            case "Gather":
-                gatherLabel.setVisible(true);
-                gatherLabel.setVisible(true);
-                nyi.setVisible(true);
-                itemNames.setVisible(true);
-                break;
-            case "Give":
-                giveLabel.setVisible(true);
-                nyi.setVisible(true);
-                itemNames.setVisible(true);
-                poiPane.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                here.setVisible(true);
-                break;
-            case "HaveReputation":
-                poiPane.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Minimum reputation needed");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                break;
-            case "haveReputationInCurrentLocation":
-                haveReputationInCurrentLocationLabel.setVisible(true);
-                poiPane.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Minimum reputation needed");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                break;
-            case "Hunt":
-                huntLabel.setVisible(true);
-                enemySelector.setVisible(true);
-                count3Description.setText("Lifespan (seconds to complete hunt before despawn)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                break;
-            case "Leave":
-                leaveLabel.setVisible(true);
-                poiPane.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Number of times to leave before triggering (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                break;
-            case "MapFlag":
-                mapFlagLabel.setVisible(true);
-                poiPane.setVisible(true);
-                here.setVisible(true);
-                anyPOI.setVisible(true);
-                mapFlagGroup.setVisible(true);
-                flagValueGroup.setVisible(true);
-                break;
-            case "None":
-                noneLabel.setVisible(true);
-                nyi.setVisible(true);
-                break;
-            case "Patrol":
-                patrolLabel.setVisible(true);
-                nyi.setVisible(true);
-                break;
-            case "Rescue":
-                rescueLabel.setVisible(true);
-                nyi.setVisible(true);
-                poiPane.setVisible(true);
-                anyPOI.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                here.setVisible(true);
-                spriteNames.setVisible(true);
-                enemySelector.setVisible(true);
-                break;
-            case "Siege":
-                siegeLabel.setVisible(true);
-                nyi.setVisible(true);
-                poiPane.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                enemySelector.setVisible(true);
-                mixedEnemies.setVisible(true);
-
-                poiPane.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Number of enemies to defeat");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                count3Spinner.setVisible(true);
-                count4Description.setText("Time limit (will only fail if > 0)");
-                count4Description.setVisible(true);
-                count4Spinner.setVisible(true);
-                break;
-            case "QuestFlag":
-                questFlagLabel.setVisible(true);
-                mapFlagGroup.setVisible(true);
-                flagValueGroup.setVisible(true);
-                break;
-            case "Travel":
-                travelLabel.setVisible(true);
-                poiPane.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                poiTokenInput.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                count1Description.setText("Target % of possible distances");
-                count1Description.setVisible(true);
-                count1Spinner.setVisible(true);
-                count2Description.setText("Plus or minus %");
-                count2Description.setVisible(true);
-                count2Spinner.setVisible(true);
-                count3Description.setText("Number of times to enter before triggering (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                break;
-            case "Use":
-                useLabel.setVisible(true);
-                nyi.setVisible(true);
-                itemNames.setVisible(true);
-                poiPane.setVisible(true);
-                anyPOI.setVisible(true);
-                here.setVisible(true);
-                poiTokenLabel.setVisible(true);
-                here.setVisible(true);
-                count3Description.setText("Number of times to use triggering (minimum 1)");
-                count3Description.setVisible(true);
-                count3Spinner.setVisible(true);
-                break;
-        }
-
-        specificPOI.setVisible(anyPOI.isVisible());
-    }
-
-    private void changeObjective(){
-        if (objectiveType.getSelectedItem() != null)
-            currentData.objective = AdventureQuestController.ObjectiveTypes.valueOf(objectiveType.getSelectedItem().toString());
-        switchPanels();
-    }
-
-    private JPanel getObjectiveTab(){
-        objectiveType = new JComboBox<>(AdventureQuestController.ObjectiveTypes.values());
-        objectiveType.addActionListener( e -> changeObjective());
-
-        JPanel objectiveTab = new JPanel();
-        JScrollPane scrollPane = new JScrollPane();
-        objectiveTab.add(scrollPane);
-        FormPanel center=new FormPanel();
-        center.add(objectiveType);
-        scrollPane.add(center);
-
-        mapFlagGroup = new Box(BoxLayout.Y_AXIS);
-        mapFlagGroup.add(new JLabel("Map flag to check"));
-        mapFlagGroup.add(mapFlag);
-
-        flagValueGroup = new Box(BoxLayout.Y_AXIS);
-        flagValueGroup.add(new JLabel("Flag value to check"));
-        flagValueGroup.add(flagSpinner);
-
-        anyPOIGroup.add(anyPOI);
-        anyPOIGroup.add(specificPOI);
-
-        JPanel poiSelectorPane = new JPanel();
-        poiSelectorPane.setLayout(new BorderLayout());
-        poiSelectorPane.add(poiSelector, BorderLayout.CENTER);
-        JPanel poiTokenPanel = new JPanel();
-
-        JPanel tokenPanel = new JPanel();
-        tokenPanel.add(new JLabel("Token to use:"));
-        tokenPanel.add(poiTokenInput);
-        tokenPanel.setBorder(new EmptyBorder(10, 10, 30, 10));
-
-        poiTokenPanel.add(poiTokenDescription);
-        poiTokenPanel.add(tokenPanel);
-        poiTokenPanel.add(here);
-
-        GroupLayout poiTokenLayout =  new GroupLayout(poiTokenPanel);
-
-
-        poiTokenLayout.setHorizontalGroup(
-            poiTokenLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                            .addComponent(poiTokenDescription)
-                            .addComponent(tokenPanel,GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
-                                    GroupLayout.PREFERRED_SIZE)
-                            .addComponent(here));
-
-        poiTokenLayout.setVerticalGroup(
-                poiTokenLayout.createSequentialGroup()
-                        .addComponent(poiTokenDescription)
-                        .addComponent(tokenPanel,GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
-                                GroupLayout.PREFERRED_SIZE)
-                        .addComponent(here));
-
-        poiTokenPanel.setLayout(poiTokenLayout);
-
-        poiPane.add("Specific PoI", poiTokenPanel);
-        poiPane.add("Tag Selector", poiSelectorPane);
-        poiPane.setPreferredSize(new Dimension(0,200));
-
-
-        center.add(arenaLabel);
-        center.add(clearLabel);
-        center.add(defeatLabel);
-        center.add(deliveryLabel);
-        center.add(escortLabel);
-        center.add(fetchLabel);
-        center.add(findLabel);
-        center.add(gatherLabel);
-        center.add(giveLabel);
-        center.add(haveReputationLabel);
-        center.add(huntLabel);
-        center.add(leaveLabel);
-        center.add(noneLabel);
-        center.add(patrolLabel);
-        center.add(rescueLabel);
-        center.add(siegeLabel);
-        center.add(mapFlagLabel);
-        center.add(questFlagLabel);
-        center.add(travelLabel);
-        center.add(useLabel);
-        center.add(nyi);
-        center.add(deliveryItem);
-        center.add(mapFlagGroup);
-        center.add(flagValueGroup);
-        center.add(anyPOI);
-        center.add(specificPOI);
-        center.add(mixedEnemies);
-        center.add(enemySelector);
-        center.add(count1Description);
-        center.add(count1Spinner);
-        center.add(count2Description);
-        center.add(count2Spinner);
-        center.add(count3Description);
-        center.add(count3Spinner);
-        center.add(count4Description);
-        center.add(count4Spinner);
-        center.add(poiPane);
-        center.add(poiTokenLabel);
-
-        switchPanels();
-
-        poiSelector.selectedItems.addListDataListener(new ListDataListener() {
-            @Override
-            public void intervalAdded(ListDataEvent e) {
-                rebuildPOIList();
-                rebuildEnemyList();
-            }
-
-            @Override
-            public void intervalRemoved(ListDataEvent e) {
-                rebuildPOIList();
-                rebuildEnemyList();
-            }
-
-            @Override
-            public void contentsChanged(ListDataEvent e) {
-                rebuildPOIList();
-                rebuildEnemyList();
-            }
-        });
-
-        return center;
-    }
-
-    private void rebuildPOIList(){
-        List<String> currentList = new ArrayList<>();
-
-        for(int i = 0; i< poiSelector.selectedItems.getSize(); i++){
-            currentList.add(poiSelector.selectedItems.getElementAt(i));
-        }
-        currentData.POITags = currentList;
-    }
-
-    private void rebuildEnemyList(){
-        List<String> currentList = new ArrayList<>();
-
-        for(int i = 0; i< enemySelector.selectedItems.getSize(); i++){
-            currentList.add(enemySelector.selectedItems.getElementAt(i));
-        }
-        currentData.enemyTags = currentList;
-    }
-
-    private JPanel getPrereqTab(){
-        JPanel prereqTab = new JPanel();
-        prereqTab.add(new JLabel("Insert Prereq data here"));
-
-        return prereqTab;
-    }
-
-    private void refresh() {
-
-        if(currentData==null)
-        {
-            return;
-        }
-        setEnabled(false);
-        updating=true;
-        objectiveType.setSelectedItem(currentData.objective);
-        if (objectiveType.getSelectedItem() != null)
-            currentData.objective = AdventureQuestController.ObjectiveTypes.valueOf(objectiveType.getSelectedItem().toString()); //Ensuring this gets initialized on new
-
-        name.setText(currentData.name);
-        description.setText(currentData.description);
-        deliveryItem.setText(currentData.deliveryItem);
-
-        if (currentData.enemyTags != null){
-            DefaultListModel<String> selectedEnemies = new DefaultListModel<>();
-            for (int i = 0; i < currentData.enemyTags.size(); i++) {
-                selectedEnemies.add(i, currentData.enemyTags.get(i));
-            }
-            enemySelector.load(selectedEnemies);
-        }
-        if (currentData.POITags != null){
-            DefaultListModel<String> selectedPOI = new DefaultListModel<>();
-            for (int i = 0; i < currentData.POITags.size(); i++) {
-                selectedPOI.add(i, currentData.POITags.get(i));
-            }
-            poiSelector.load(selectedPOI);
-        }
-
-        itemNames.setText(currentData.itemNames);
-        equipNames.setText(currentData.equipNames);
-        prologueEditor.loadData(currentData.prologue);
-        epilogueEditor.loadData(currentData.epilogue);
-
-
-        if (currentData.POITags != null){
-            DefaultListModel<String> selectedPOI = new DefaultListModel<>();
-            for (int i = 0; i < currentData.POITags.size(); i++) {
-                selectedPOI.add(i, currentData.POITags.get(i));
-            }
-            poiSelector.load(selectedPOI);
-        }
-        here.getModel().setSelected(currentData.here);
-        anyPOI.getModel().setSelected(currentData.anyPOI);
-        specificPOI.getModel().setSelected(!currentData.anyPOI);
-        poiTokenInput.setText(currentData.POIToken);
-        poiTokenLabel.setText( "To reference this point of interest: $(poi_" + currentData.id + ")");
-
-        ArrayList<String> temp = new ArrayList<>();
-        for (AdventureQuestStage stage : currentQuestData.stages){
-            if (stage.equals(currentData))
-                continue;
-            temp.add(stage.name);
-        }
-        prerequisites.setOptions(temp);
-
-        count1Spinner.getModel().setValue(currentData.count1);
-        count2Spinner.getModel().setValue(currentData.count2);
-        count3Spinner.getModel().setValue(currentData.count3);
-        count4Spinner.getModel().setValue(currentData.count4);
-
-        updating=false;
-        setEnabled(true);
-    }
-    public void updateStage()
-    {
-        if(currentData==null||updating)
-            return;
-
-        currentData.name=name.getText();
-        currentData.description= description.getText();
-        currentData.prologue = prologueEditor.getDialogData();
-        currentData.epilogue = epilogueEditor.getDialogData();
-        currentData.deliveryItem = deliveryItem.getText();
-        currentData.itemNames = itemNames.getList()==null?new ArrayList<>():Arrays.asList(itemNames.getList());
-        currentData.equipNames = equipNames.getList()==null?new ArrayList<>():Arrays.asList(equipNames.getList());
-        currentData.anyPOI = anyPOI.getModel().isSelected();
-        currentData.mapFlag = mapFlag.getText();
-        currentData.mapFlagValue = Integer.parseInt(flagSpinner.getModel().getValue().toString());
-        currentData.count1 = Integer.parseInt(count1Spinner.getModel().getValue().toString());
-        currentData.count2 = Integer.parseInt(count2Spinner.getModel().getValue().toString());
-        currentData.count3 = Integer.parseInt(count3Spinner.getModel().getValue().toString());
-        currentData.count4 = Integer.parseInt(count4Spinner.getModel().getValue().toString());
-        currentData.mixedEnemies = mixedEnemies.getModel().isSelected();
-        currentData.here = here.getModel().isSelected();
-        currentData.POIToken = poiTokenInput.getText();
-
-        rebuildPOIList();
-        rebuildEnemyList();
-        emitChanged();
-    }
-    public void setCurrentStage(AdventureQuestStage stageData, AdventureQuestData data) {
-        if (stageData == null)
-            stageData = new AdventureQuestStage();
-        if (data == null)
-            data = new AdventureQuestData();
-        currentData =stageData;
-        currentQuestData=data;
-        setVisible(true);
-        refresh();
-    }
-
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-    protected void emitChanged() {
-        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
-        if (listeners != null && listeners.length > 0) {
-            ChangeEvent evt = new ChangeEvent(this);
-            for (ChangeListener listener : listeners) {
-                listener.stateChanged(evt);
-            }
-        }
-    }
-
-    private void addListeners(){
-        deliveryItem.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        mapFlag.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        flagSpinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        count1Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        count2Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        count3Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        count4Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        mixedEnemies.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        here.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        anyPOI.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
-        deliveryItem.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        mapFlag.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
-        prologueEditor.addChangeListener(q -> QuestStageEdit.this.updateStage());
-        epilogueEditor.addChangeListener(q -> QuestStageEdit.this.updateStage());
-    }
-}

forge-adventure/pom.xml

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>forge</artifactId>
+        <groupId>forge</groupId>
+        <version>1.6.57</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>forge-adventure</artifactId>
+    <packaging>jar</packaging>
+    <name>Forge Adventure</name>
+    <repositories>
+        <repository>
+            <id>gdx-nightlies</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${project.basedir}</directory>
+                <includes>
+                    <include>**/*.vert</include>
+                    <include>**/*.frag</include>
+                    <include>**/title_bg_lq.png</include>
+                    <include>**/transition.png</include>
+                    <include>**/adv_bg_texture.jpg</include>
+                    <include>**/adv_bg_splash.png</include>
+                    <include>**/bg_splash.png</include>
+                    <include>**/bg_texture.jpg</include>
+                    <include>**/font1.ttf</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                    <groupId>com.akathist.maven.plugins.launch4j</groupId>
+                    <artifactId>launch4j-maven-plugin</artifactId>
+                    <version>1.7.25</version>
+                    <executions>
+                        <execution>
+                            <id>l4j-adv</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>launch4j</goal>
+                            </goals>
+                            <configuration>
+                                <headerType>gui</headerType>
+                                <outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile>
+                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
+                                <dontWrapJar>true</dontWrapJar>
+                                <errTitle>forge</errTitle>
+                                <icon>src/main/config/forge-adventure-editor.ico</icon>
+                                <classPath>
+                                    <mainClass>forge.adventure.Main</mainClass>
+                                    <addDependencies>false</addDependencies>
+                                    <preCp>anything</preCp>
+                                </classPath>
+                                <jre>
+                                    <minVersion>1.8.0</minVersion>
+                                    <maxHeapSize>4096</maxHeapSize>
+                                    <opts>
+                                        <opt>-Dfile.encoding=UTF-8</opt>
+                                    </opts>
+                                </jre>
+                                <versionInfo>
+                                    <fileVersion>
+                                        1.0.0.0
+                                    </fileVersion>
+                                    <txtFileVersion>
+                                        1.0.0.0
+                                    </txtFileVersion>
+                                    <fileDescription>Forge</fileDescription>
+                                    <copyright>Forge</copyright>
+                                    <productVersion>
+                                        1.0.0.0
+                                    </productVersion>
+                                    <txtProductVersion>
+                                        1.0.0.0
+                                    </txtProductVersion>
+                                    <productName>forge-adventure-editor</productName>
+                                    <internalName>forge-adventure-editor</internalName>
+                                    <originalFilename>forge-adventure-editor-java8.exe</originalFilename>
+                                </versionInfo>
+                            </configuration>
+                        </execution>
+                        <!--extra-->
+                        <execution>
+                            <id>l4j-adv2</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>launch4j</goal>
+                            </goals>
+                            <configuration>
+                                <headerType>gui</headerType>
+                                <outfile>${project.build.directory}/forge-adventure-editor.exe</outfile>
+                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
+                                <dontWrapJar>true</dontWrapJar>
+                                <errTitle>forge</errTitle>
+                                <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
+                                <icon>src/main/config/forge-adventure-editor.ico</icon>
+                                <classPath>
+                                    <mainClass>forge.adventure.Main</mainClass>
+                                    <addDependencies>false</addDependencies>
+                                    <preCp>anything</preCp>
+                                </classPath>
+                                <jre>
+                                    <minVersion>11.0.1</minVersion>
+                                    <jdkPreference>jdkOnly</jdkPreference>
+                                    <maxHeapSize>4096</maxHeapSize>
+                                    <opts>
+                                        <opt>-Dfile.encoding=UTF-8</opt>
+                                        <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
+                                        <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
+                                        <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
+                                    </opts>
+                                </jre>
+                                <versionInfo>
+                                    <fileVersion>
+                                        1.0.0.0
+                                    </fileVersion>
+                                    <txtFileVersion>
+                                        1.0.0.0
+                                    </txtFileVersion>
+                                    <fileDescription>Forge</fileDescription>
+                                    <copyright>Forge</copyright>
+                                    <productVersion>
+                                        1.0.0.0
+                                    </productVersion>
+                                    <txtProductVersion>
+                                        1.0.0.0
+                                    </txtProductVersion>
+                                    <productName>forge-adventure-editor</productName>
+                                    <internalName>forge-adventure-editor</internalName>
+                                    <originalFilename>forge-adventure-editor.exe</originalFilename>
+                                </versionInfo>
+                            </configuration>
+                        </execution>
+                        <!--extra-->
+                    </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <basedir>${basedir}/${configSourceDirectory}</basedir>
+                    <filesToInclude>forge-adventure-editor.sh, forge-adventure-editor-mac.sh, forge-adventure-editor.command, forge-adventure-editor.cmd</filesToInclude>
+                    <outputBasedir>${project.build.directory}</outputBasedir>
+                    <outputDir>.</outputDir>
+                    <regex>false</regex>
+                    <replacements>
+                        <replacement>
+                            <token>$project.build.finalName$</token>
+                            <value>${project.build.finalName}-jar-with-dependencies.jar</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+            <plugin>
+
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <attach>false</attach>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>forge.adventure.Main</mainClass>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <!-- this is used for inheritance merges -->
+                        <phase>package</phase>
+                        <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx</artifactId>
+            <version>1.11.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-platform</artifactId>
+            <version>1.11.0</version>
+            <classifier>natives-desktop</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-freetype</artifactId>
+            <version>1.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-backend-lwjgl</artifactId>
+            <version>1.11.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-tools</artifactId>
+            <version>1.11.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-freetype-platform</artifactId>
+            <version>1.11.0</version>
+            <classifier>natives-desktop</classifier>
+        </dependency>
+        <dependency>
+            <groupId>forge</groupId>
+            <artifactId>forge-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>forge</groupId>
+            <artifactId>forge-gui</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>forge</groupId>
+            <artifactId>forge-gui-mobile</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>22.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx-controllers</groupId>
+            <artifactId>gdx-controllers-desktop</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

forge-adventure/shaders/grayscale.frag

@@ -0,0 +1,16 @@
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+varying vec4 v_color;
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
+uniform float u_grayness;
+uniform float u_bias;
+
+void main() {
+  vec4 c = v_color * texture2D(u_texture, v_texCoords);
+  float grey = dot( c.rgb, vec3(0.22, 0.707, 0.071) );
+  vec3 blendedColor = mix(c.rgb, vec3(grey), u_grayness);
+  gl_FragColor = mix(vec4(0.0, 0.0, 0.0, 1.0), vec4(blendedColor.rgb, c.a), u_bias);
+}

forge-adventure/shaders/grayscale.vert

@@ -0,0 +1,14 @@
+attribute vec4 a_position;
+attribute vec4 a_color;
+attribute vec2 a_texCoord0;
+
+uniform mat4 u_projTrans;
+
+varying vec4 v_color;
+varying vec2 v_texCoords;
+
+void main() {
+    v_color = a_color;
+    v_texCoords = a_texCoord0;
+    gl_Position = u_projTrans * a_position;
+}

forge-adventure/shaders/outline.frag

@@ -0,0 +1,40 @@
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
+uniform sampler2D u_texture;
+uniform vec2 u_viewportInverse;
+uniform vec3 u_color;
+uniform float u_offset;
+uniform float u_step;
+
+varying vec4 v_color;
+varying vec2 v_texCoord;
+
+#define ALPHA_VALUE_BORDER 0.5
+
+void main() {
+   vec2 T = v_texCoord.xy;
+
+   float alpha = 0.0;
+   bool allin = true;
+   for( float ix = -u_offset; ix < u_offset; ix += u_step )
+   {
+      for( float iy = -u_offset; iy < u_offset; iy += u_step )
+       {
+          float newAlpha = texture2D(u_texture, T + vec2(ix, iy) * u_viewportInverse).a;
+          allin = allin && newAlpha > ALPHA_VALUE_BORDER;
+          if (newAlpha > ALPHA_VALUE_BORDER && newAlpha >= alpha)
+          {
+             alpha = newAlpha;
+          }
+      }
+   }
+   if (allin)
+   {
+      alpha = 0.0;
+   }
+
+   gl_FragColor = vec4(u_color,alpha);
+}

forge-adventure/shaders/outline.vert

@@ -0,0 +1,16 @@
+uniform mat4 u_projTrans;
+
+attribute vec4 a_position;
+attribute vec2 a_texCoord0;
+attribute vec4 a_color;
+
+varying vec4 v_color;
+varying vec2 v_texCoord;
+
+uniform vec2 u_viewportInverse;
+
+void main() {
+    gl_Position = u_projTrans * a_position;
+    v_texCoord = a_texCoord0;
+    v_color = a_color;
+}

forge-adventure/shaders/underwater.frag

@@ -0,0 +1,26 @@
+#ifdef GL_ES
+#define PRECISION mediump
+precision PRECISION float;
+precision PRECISION int;
+#else
+#define PRECISION
+#endif
+
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
+uniform float u_amount;
+uniform float u_speed;
+uniform float u_time;
+uniform float u_bias;
+
+void main () {
+    vec2 uv = v_texCoords;
+
+    uv.y += (cos((uv.y + (u_time * 0.04 * u_speed)) * 45.0) * 0.0019 * u_amount) + (cos((uv.y + (u_time * 0.1 * u_speed)) * 10.0) * 0.002 * u_amount);
+
+    uv.x += (sin((uv.y + (u_time * 0.07 * u_speed)) * 15.0) * 0.0029 * u_amount) + (sin((uv.y + (u_time * 0.1 * u_speed)) * 15.0) * 0.002 * u_amount);
+
+	vec4 texColor = texture2D(u_texture, uv);
+
+    gl_FragColor = mix(vec4(0.0, 0.0, 0.0, 1.0), texColor, u_bias);
+}

forge-adventure/shaders/warp.frag

@@ -0,0 +1,57 @@
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
+
+uniform float u_time;
+uniform float u_speed;
+uniform float u_amount;
+uniform vec2 u_viewport;
+uniform vec2 u_position;
+
+float random2d(vec2 n) {
+    return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
+}
+
+float randomRange (in vec2 seed, in float min, in float max) {
+    return min + random2d(seed) * (max - min);
+}
+
+float insideRange(float v, float bottom, float top) {
+   return step(bottom, v) - step(top, v);
+}
+
+void main()
+{
+    float time = floor(u_time * u_speed * 60.0);
+
+    vec3 outCol = texture2D(u_texture, v_texCoords).rgb;
+
+    float maxOffset = u_amount/2.0;
+    for (float i = 0.0; i < 2.0; i += 1.0) {
+        float sliceY = random2d(vec2(time, 2345.0 + float(i)));
+        float sliceH = random2d(vec2(time, 9035.0 + float(i))) * 0.25;
+        float hOffset = randomRange(vec2(time, 9625.0 + float(i)), -maxOffset, maxOffset);
+        vec2 uvOff = v_texCoords;
+        uvOff.x += hOffset;
+        if (insideRange(v_texCoords.y, sliceY, fract(sliceY+sliceH)) == 1.0){
+            outCol = texture2D(u_texture, uvOff).rgb;
+        }
+    }
+
+    float maxColOffset = u_amount / 6.0;
+    float rnd = random2d(vec2(time , 9545.0));
+    vec2 colOffset = vec2(randomRange(vec2(time , 9545.0), -maxColOffset, maxColOffset),
+                       randomRange(vec2(time , 7205.0), -maxColOffset, maxColOffset));
+    if (rnd < 0.33) {
+        outCol.r = texture2D(u_texture, v_texCoords + colOffset).r;
+    } else if (rnd < 0.66) {
+        outCol.g = texture2D(u_texture, v_texCoords + colOffset).g;
+    } else {
+        outCol.b = texture2D(u_texture, v_texCoords + colOffset).b;
+    }
+
+    gl_FragColor = vec4(outCol, 1.0);
+}

forge-adventure/src/main/config/forge-adventure-editor-mac.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd $(dirname "${0}")
+java -XstartOnFirstThread -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$

forge-adventure/src/main/config/forge-adventure-editor.cmd

@@ -0,0 +1,25 @@
+@echo off
+
+pushd %~dp0
+
+java -version 1>nul 2>nul || (
+   echo no java installed
+   popd
+   exit /b 2
+)
+for /f tokens^=2^ delims^=.-_^+^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j"
+
+if %jver% GEQ 17 (
+  java --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+  popd
+  exit /b 0
+)
+
+if %jver% GEQ 11 (
+  java --illegal-access=permit -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+  popd
+  exit /b 0
+)
+
+java -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+popd

forge-adventure/src/main/java/forge/adventure/Main.java

@@ -16,6 +16,7 @@ public class Main {
     public static void main(String[] args) {
         GuiBase.setInterface(new GuiMobile(Files.exists(Paths.get("./res"))?"./":"../forge-gui/"));
         GuiBase.setDeviceInfo("", "", 0, 0);
-        new EditorMainWindow(Config.instance());
+        Config.instance();
+        new EditorMainWindow();
     }
 }

forge-adventure/src/main/java/forge/adventure/editor/ActionEdit.java

@@ -2,9 +2,7 @@ package forge.adventure.editor;
 
 import forge.adventure.data.DialogData;
 
-import javax.swing.JSpinner;
-import javax.swing.JTextField;
-import javax.swing.SpinnerNumberModel;
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -160,9 +158,9 @@ public class ActionEdit extends FormPanel {
         advanceQuestFlag.setText(currentData.advanceQuestFlag);
         advanceCharacterFlag.setText(currentData.advanceCharacterFlag);
 
-        battleWithActorID.setText(String.valueOf(currentData.battleWithActorID));
-        activateObjectID.setText(String.valueOf(currentData.battleWithActorID));
-        deleteMapObject.setText(String.valueOf(currentData.deleteMapObject));
+        battleWithActorID.setText("" + currentData.battleWithActorID);
+        activateObjectID.setText("" + currentData.battleWithActorID);
+        deleteMapObject.setText("" + currentData.deleteMapObject);
         setColorIdentity.setText(currentData.setColorIdentity);
         addLife.getModel().setValue(currentData.addLife);
         addReputation.getModel().setValue(currentData.addMapReputation);

forge-adventure/src/main/java/forge/adventure/editor/ActionEditor.java

@@ -0,0 +1,141 @@
+package forge.adventure.editor;
+
+import forge.adventure.data.DialogData;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class ActionEditor extends JComponent{
+    DefaultListModel<DialogData.ActionData> model = new DefaultListModel<>();
+    JList<DialogData.ActionData> list = new JList<>(model);
+    JToolBar toolBar = new JToolBar("toolbar");
+    ActionEdit edit=new ActionEdit();
+    boolean updating;
+
+
+    public class RewardDataRenderer extends DefaultListCellRenderer {
+        @Override
+        public Component getListCellRendererComponent(
+                JList list, Object value, int index,
+                boolean isSelected, boolean cellHasFocus) {
+            JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            if(!(value instanceof DialogData.ActionData))
+                return label;
+            DialogData.ActionData action=(DialogData.ActionData) value;
+            StringBuilder builder=new StringBuilder();
+//            if(action.type==null||action.type.isEmpty())
+                builder.append("Action");
+//            else
+//                builder.append(action.type);
+            label.setText(builder.toString());
+            return label;
+        }
+    }
+    public void addButton(String name, ActionListener action)
+    {
+        JButton newButton=new JButton(name);
+        newButton.addActionListener(action);
+        toolBar.add(newButton);
+
+    }
+
+    public ActionEditor()
+    {
+
+        list.setCellRenderer(new RewardDataRenderer());
+        list.addListSelectionListener(e -> ActionEditor.this.updateEdit());
+        addButton("add", e -> ActionEditor.this.addAction());
+        addButton("remove", e -> ActionEditor.this.remove());
+        addButton("copy", e -> ActionEditor.this.copy());
+        BorderLayout layout=new BorderLayout();
+        setLayout(layout);
+        add(list, BorderLayout.LINE_START);
+        add(toolBar, BorderLayout.PAGE_START);
+        add(edit,BorderLayout.CENTER);
+
+
+        edit.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                emitChanged();
+            }
+        });
+    }
+    protected void emitChanged() {
+        if (updating)
+            return;
+        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
+        if (listeners != null && listeners.length > 0) {
+            ChangeEvent evt = new ChangeEvent(this);
+            for (ChangeListener listener : listeners) {
+                listener.stateChanged(evt);
+            }
+        }
+    }
+    private void copy() {
+
+        int selected=list.getSelectedIndex();
+        if(selected<0)
+            return;
+        DialogData.ActionData data=new DialogData.ActionData(model.get(selected));
+        model.add(model.size(),data);
+    }
+
+    private void updateEdit() {
+
+        int selected=list.getSelectedIndex();
+        if(selected<0)
+            return;
+        edit.setCurrentAction(model.get(selected));
+    }
+
+    void addAction()
+    {
+        DialogData.ActionData data=new DialogData.ActionData();
+        model.add(model.size(),data);
+    }
+    void remove()
+    {
+        int selected=list.getSelectedIndex();
+        if(selected<0)
+            return;
+        model.remove(selected);
+    }
+    public void setAction(DialogData.ActionData[] actions) {
+
+        model.clear();
+        if(actions==null)
+            return;
+        for (int i=0;i<actions.length;i++) {
+            if (actions[i].grantRewards.length > 0){
+                continue; //handled in separate editor and joined in on save, will get duplicated if it appears here
+            }
+            model.add(i,actions[i]);
+        }
+    }
+
+    public DialogData.ActionData[] getAction() {
+
+        DialogData.ActionData[] action= new DialogData.ActionData[model.getSize()];
+        for(int i=0;i<model.getSize();i++)
+        {
+            action[i]=model.get(i);
+        }
+        return action;
+    }
+
+    public void clear(){
+        updating = true;
+        model.clear();
+        updating = false;
+    }
+    public void addChangeListener(ChangeListener listener) {
+        listenerList.add(ChangeListener.class, listener);
+    }
+}

forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java

@@ -51,12 +51,12 @@ public class BiomeEdit extends FormPanel {
         add(terrain);
         add(structures);
 
-        name.getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
-        tilesetName.getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
-        color.getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
+        name.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain()));
+        tilesetName.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain()));
+        color.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain()));
         collision.addChangeListener(e -> BiomeEdit.this.updateTerrain());
-        spriteNames.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
-        enemies.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
+        spriteNames.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain()));
+        enemies.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain()));
         terrain.addChangeListener(e -> BiomeEdit.this.updateTerrain());
 
 
@@ -64,7 +64,7 @@ public class BiomeEdit extends FormPanel {
         startPointY.addChangeListener(e -> BiomeEdit.this.updateTerrain());
         noiseWeight.addChangeListener(e -> BiomeEdit.this.updateTerrain());
         distWeight.addChangeListener(e -> BiomeEdit.this.updateTerrain());
-        tilesetAtlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
+        tilesetAtlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain()));
         width.addChangeListener(e -> BiomeEdit.this.updateTerrain());
         height.addChangeListener(e -> BiomeEdit.this.updateTerrain());
         refresh();

forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java

@@ -45,16 +45,17 @@ public class BiomeStructureDataMappingEditor extends JComponent {
                 JList list, Object value, int index,
                 boolean isSelected, boolean cellHasFocus) {
             JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(!(value instanceof BiomeStructureData.BiomeStructureDataMapping biomeData))
+            if(!(value instanceof BiomeStructureData.BiomeStructureDataMapping))
                 return label;
+            BiomeStructureData.BiomeStructureDataMapping data=(BiomeStructureData.BiomeStructureDataMapping) value;
             // Get the renderer component from parent class
 
-            label.setText(biomeData.name);
+            label.setText(data.name);
             if(editor.data!=null)
             {
                 SwingAtlas itemAtlas=new SwingAtlas(Config.instance().getFile(editor.data.structureAtlasPath));
-                if(itemAtlas.has(biomeData.name))
-                    label.setIcon(itemAtlas.get(biomeData.name));
+                if(itemAtlas.has(data.name))
+                    label.setIcon(itemAtlas.get(data.name));
                 else
                 {
                     ImageIcon img=itemAtlas.getAny();
@@ -134,8 +135,8 @@ public class BiomeStructureDataMappingEditor extends JComponent {
             add("color:",color);
             add("collision:",collision);
 
-            name.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureDataMappingEdit.this::update));
-            color.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureDataMappingEdit.this::update));
+            name.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureDataMappingEdit.this.update()));
+            color.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureDataMappingEdit.this.update()));
             collision.addChangeListener(e -> BiomeStructureDataMappingEdit.this.update());
             refresh();
         }

forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java

@@ -45,7 +45,7 @@ public class BiomeStructureEdit extends FormPanel {
         add(center);
         add(data);
 
-        structureAtlasPath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
+        structureAtlasPath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure()));
 
 
         x.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
@@ -55,8 +55,8 @@ public class BiomeStructureEdit extends FormPanel {
         randomPosition.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
 
         N.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        sourcePath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
-        maskPath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
+        sourcePath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure()));
+        maskPath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure()));
         periodicInput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
         ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
         symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());

forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java

@@ -27,7 +27,7 @@ public class BiomeTerrainEdit extends FormPanel {
         center.add("resolution:",resolution);
         add(center,preview);
 
-        spriteName.getDocument().addDocumentListener(new DocumentChangeListener(BiomeTerrainEdit.this::updateTerrain));
+        spriteName.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeTerrainEdit.this.updateTerrain()));
 
         min.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());
         max.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());

forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEdit.java

@@ -40,8 +40,8 @@ public class DialogOptionEdit extends FormPanel {
 
         add(middle);
 
-        name.getDocument().addDocumentListener(new DocumentChangeListener(DialogOptionEdit.this::updateDialog));
-        text.getDocument().addDocumentListener(new DocumentChangeListener(DialogOptionEdit.this::updateDialog));
+        name.getDocument().addDocumentListener(new DocumentChangeListener(() -> DialogOptionEdit.this.updateDialog()));
+        text.getDocument().addDocumentListener(new DocumentChangeListener(() -> DialogOptionEdit.this.updateDialog()));
 
 
     }

forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEditor.java

@@ -25,8 +25,9 @@ public class DialogOptionEditor extends JComponent{
                 JList list, Object value, int index,
                 boolean isSelected, boolean cellHasFocus) {
             JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(!(value instanceof DialogData dialog))
+            if(!(value instanceof DialogData))
                 return label;
+            DialogData dialog=(DialogData) value;
             StringBuilder builder=new StringBuilder();
             if(dialog.name==null||dialog.name.isEmpty())
                 builder.append("[[Blank Option]]");

forge-adventure/src/main/java/forge/adventure/editor/DialogTree.java

@@ -49,7 +49,12 @@ public class DialogTree extends JPanel {
 
     public void addSelectionListener(){
         //subscribe to valueChanged, change to that object in edit pane
-        dialogTree.getSelectionModel().addTreeSelectionListener(this::emitChanged);
+        dialogTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
+            @Override
+            public void valueChanged(TreeSelectionEvent e) {
+                emitChanged(e);
+            }
+        });
 
     }
 

forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java

@@ -0,0 +1,52 @@
+package forge.adventure.editor;
+
+
+
+import com.badlogic.gdx.tools.particleeditor.ParticleEditor;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class EditorMainWindow extends JFrame {
+    public final static WorldEditor worldEditor = new WorldEditor();
+    JTabbedPane tabs =new JTabbedPane();
+
+    public EditorMainWindow()
+    {
+        UIManager.LookAndFeelInfo[] var1 = UIManager.getInstalledLookAndFeels();
+        int var2 = var1.length;
+
+        for(int var3 = 0; var3 < var2; ++var3) {
+            UIManager.LookAndFeelInfo info = var1[var3];
+            if ("Nimbus".equals(info.getName())) {
+                try {
+                    UIManager.setLookAndFeel(info.getClassName());
+                } catch (Throwable var6) {
+                }
+                break;
+            }
+        }
+        BorderLayout layout=new BorderLayout();
+        JToolBar toolBar = new JToolBar("toolbar");
+        JButton newButton=new JButton("open ParticleEditor");
+        newButton.addActionListener(e -> EventQueue.invokeLater(() ->new ParticleEditor()));
+        toolBar.add(newButton);
+        setLayout(layout);
+        toolBar.setFloatable(false);
+        add(toolBar, BorderLayout.NORTH);
+        add(tabs, BorderLayout.CENTER);
+        tabs.addTab("World",worldEditor);
+        tabs.addTab("POI",new PointOfInterestEditor());
+        tabs.addTab("Items",new ItemsEditor());
+        tabs.addTab("Enemies",new EnemyEditor());
+        tabs.addTab("Quests",new QuestEditor());
+
+        setVisible(true);
+        setSize(800,600);
+        GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().setFullScreenWindow( this );
+
+    }
+}

forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java

@@ -42,8 +42,8 @@ public class EffectEditor extends JComponent  {
         lifeModifier.addChangeListener(e -> EffectEditor.this.updateEffect());
         moveSpeed.addChangeListener(e -> EffectEditor.this.updateEffect());
         colorView.addChangeListener(e -> EffectEditor.this.updateEffect());
-        name.getDocument().addDocumentListener(new DocumentChangeListener(EffectEditor.this::updateEffect));
-        startBattleWithCard.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(EffectEditor.this::updateEffect));
+        name.getDocument().addDocumentListener(new DocumentChangeListener(() -> EffectEditor.this.updateEffect()));
+        startBattleWithCard.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> EffectEditor.this.updateEffect()));
         if(opponent!=null)
 
             opponent.addChangeListener(e -> EffectEditor.this.updateEffect());
@@ -57,9 +57,9 @@ public class EffectEditor extends JComponent  {
  
 
         currentData.name=name.getText();
-        currentData.changeStartCards = (Integer) changeStartCards.getValue();
-        currentData.lifeModifier = (Integer) lifeModifier.getValue();
-        currentData.moveSpeed = (Float) moveSpeed.getValue();
+        currentData.changeStartCards=((Integer)changeStartCards.getValue()).intValue();
+        currentData.lifeModifier= ((Integer)lifeModifier.getValue()).intValue();
+        currentData.moveSpeed= ((Float)moveSpeed.getValue()).floatValue();
         currentData.startBattleWithCard = startBattleWithCard.getList();
         currentData.colorView = colorView.isSelected();
         currentData.opponent = opponent.currentData;

forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java

@@ -24,7 +24,6 @@ public class EnemyEdit extends FormPanel {
     JCheckBox ignoreDungeonEffect=new JCheckBox();
     FloatSpinner lifeFiled= new FloatSpinner(0, 1000, 1);
     FloatSpinner spawnRate= new FloatSpinner(  0.f, 1, 0.1f);
-    FloatSpinner scale= new FloatSpinner(  0.f, 8, 0.1f);
     FloatSpinner difficulty= new FloatSpinner(  0.f, 1, 0.1f);
     FloatSpinner speed= new FloatSpinner( 0.f, 100.f, 1.0f);
     FilePicker deck=new FilePicker(new String[]{"dck","json"});
@@ -56,7 +55,6 @@ public class EnemyEdit extends FormPanel {
 
         basicInfo.add("Life:",lifeFiled);
         basicInfo.add("Spawn rate:",spawnRate);
-        basicInfo.add("Scale:",scale);
         basicInfo.add("Difficulty:",difficulty);
         basicInfo.add("Speed:",speed);
         basicInfo.add("Deck:",deck);
@@ -203,7 +201,6 @@ public class EnemyEdit extends FormPanel {
         deck.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
         lifeFiled.addChangeListener(e -> EnemyEdit.this.updateEnemy());
         speed.addChangeListener(e -> EnemyEdit.this.updateEnemy());
-        scale.addChangeListener(e -> EnemyEdit.this.updateEnemy());
         difficulty.addChangeListener(e -> EnemyEdit.this.updateEnemy());
         spawnRate.addChangeListener(e -> EnemyEdit.this.updateEnemy());
         rewards.addChangeListener(e -> EnemyEdit.this.updateEnemy());
@@ -276,10 +273,9 @@ public class EnemyEdit extends FormPanel {
             currentData.equipment=null;
         else
             currentData.equipment=equipment.getText().split(",");
-        currentData.speed=  speed.floatValue();
-        currentData.scale=  scale.floatValue();
-        currentData.spawnRate=spawnRate.floatValue();
-        currentData.difficulty=difficulty.floatValue();
+        currentData.speed=  ((Double)  speed.getValue()).floatValue();
+        currentData.spawnRate=((Double)  spawnRate.getValue()).floatValue();
+        currentData.difficulty=((Double)  difficulty.getValue()).floatValue();
         currentData.deck= deck.getEdit().getText().split(",");
         currentData.rewards= rewards.getRewards();
         preview.setSpritePath(currentData.sprite);
@@ -289,7 +285,7 @@ public class EnemyEdit extends FormPanel {
             tags.add(e.nextElement());
         }
 
-        tags.removeIf(String::isEmpty);
+        tags.removeIf(q -> q.isEmpty());
         currentData.questTags = tags.toArray(currentData.questTags);
         QuestController.getInstance().refresh();
         filterExisting(enemyModel);
@@ -320,10 +316,9 @@ public class EnemyEdit extends FormPanel {
         else
             equipment.setText("");
         deck.getEdit().setText(String.join(",",currentData.deck));
-        speed.setValue(currentData.speed);
-        scale.setValue(currentData.scale);
-        spawnRate.setValue(currentData.spawnRate);
-        difficulty.setValue(currentData.difficulty);
+        speed.setValue(new Float(currentData.speed).doubleValue());
+        spawnRate.setValue(new Float(currentData.spawnRate).doubleValue());
+        difficulty.setValue(new Float(currentData.difficulty).doubleValue());
         rewards.setRewards(currentData.rewards);
         preview.setSpritePath(currentData.sprite);
         enemyModel.clear();

forge-adventure/src/main/java/forge/adventure/editor/FilePicker.java

@@ -4,6 +4,8 @@ import forge.adventure.util.Config;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 
@@ -19,7 +21,12 @@ public class FilePicker extends Box {
         super(BoxLayout.X_AXIS);
         this.fileEndings = fileEndings;
 
-        findButton.addActionListener(e -> FilePicker.this.find());
+        findButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                FilePicker.this.find();
+            }
+        });
 
         add(edit);
         add(findButton);

forge-adventure/src/main/java/forge/adventure/editor/FloatSpinner.java

@@ -14,6 +14,6 @@ public class FloatSpinner extends JSpinner{
     }
     public float floatValue()
     {
-        return (Float) getValue();
+        return ((Float)getValue()).floatValue();
     }
 }

forge-adventure/src/main/java/forge/adventure/editor/IntSpinner.java

@@ -15,6 +15,6 @@ public class IntSpinner extends JSpinner {
     }
     public int intValue()
     {
-        return (Integer) getValue();
+        return ((Integer)getValue()).intValue();
     }
 }

forge-adventure/src/main/java/forge/adventure/editor/ItemEdit.java

@@ -38,10 +38,10 @@ public class ItemEdit extends JComponent {
         add(effect);
         add(new Box.Filler(new Dimension(0,0),new Dimension(0,Integer.MAX_VALUE),new Dimension(0,Integer.MAX_VALUE)));
 
-        nameField.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
-        equipmentSlot.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
-        description.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
-        iconName.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
+        nameField.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem()));
+        equipmentSlot.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem()));
+        description.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem()));
+        iconName.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem()));
         cost.addChangeListener(e -> ItemEdit.this.updateItem());
         questItem.addChangeListener(e -> ItemEdit.this.updateItem());
         effect.addChangeListener(e -> ItemEdit.this.updateItem());
@@ -57,7 +57,7 @@ public class ItemEdit extends JComponent {
         currentData.description=description.getText();
         currentData.iconName=iconName.getText();
         currentData.questItem=questItem.isSelected();
-        currentData.cost= (Integer) cost.getValue();
+        currentData.cost=((Integer)  cost.getValue()).intValue();
     }
 
     public void setCurrentItem(ItemData data)

forge-adventure/src/main/java/forge/adventure/editor/ItemsEditor.java

@@ -27,16 +27,17 @@ public class ItemsEditor extends JComponent {
                 JList list, Object value, int index,
                 boolean isSelected, boolean cellHasFocus) {
             JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(!(value instanceof ItemData item))
+            if(!(value instanceof ItemData))
                 return label;
+            ItemData Item=(ItemData) value;
             // Get the renderer component from parent class
 
-            label.setText(item.name);
+            label.setText(Item.name);
             if(itemAtlas==null)
                 itemAtlas=new SwingAtlas(Config.instance().getFile(Paths.ITEMS_ATLAS));
             
-            if(itemAtlas.has(item.iconName))
-                label.setIcon(itemAtlas.get(item.iconName));
+            if(itemAtlas.has(Item.iconName))
+                label.setIcon(itemAtlas.get(Item.iconName));
             else
             {
                 ImageIcon img=itemAtlas.getAny();

forge-adventure/src/main/java/forge/adventure/editor/QuestEdit.java

@@ -2,23 +2,10 @@ package forge.adventure.editor;
 
 import forge.adventure.data.AdventureQuestData;
 
-import javax.swing.AbstractAction;
-import javax.swing.BoxLayout;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
+import javax.swing.*;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -298,7 +285,7 @@ public class QuestEdit extends FormPanel {
         }
         setVisible(true);
         updating=true;
-        id.setText(String.valueOf(currentData.getID()));
+        id.setText(currentData.getID() + "");
         name.setText(currentData.name);
         description.setText(currentData.description);
         synopsis.setText(currentData.synopsis);

forge-adventure/src/main/java/forge/adventure/editor/QuestEditor.java

@@ -26,8 +26,9 @@ public class QuestEditor extends JComponent {
                 JList list, Object value, int index,
                 boolean isSelected, boolean cellHasFocus) {
             JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(!(value instanceof AdventureQuestData quest))
+            if(!(value instanceof AdventureQuestData))
                 return label;
+            AdventureQuestData quest=(AdventureQuestData) value;
             // Get the renderer component from parent class
 
             label.setText(quest.name);

forge-adventure/src/main/java/forge/adventure/editor/QuestStageEdit.java

@@ -0,0 +1,618 @@
+package forge.adventure.editor;
+
+import forge.adventure.data.*;
+import forge.adventure.util.AdventureQuestController;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class QuestStageEdit extends FormPanel {
+    private boolean updating=false;
+    AdventureQuestStage currentData;
+    AdventureQuestData currentQuestData;
+    public JTextField name=new JTextField("", 25);
+    public JTextField description=new JTextField("", 25);
+    public TextListEdit itemNames =new TextListEdit();
+    public TextListEdit spriteNames =new TextListEdit();
+    public TextListEdit equipNames =new TextListEdit();
+    public TextListEdit prerequisites =new TextListEdit(currentQuestData!=null?(String[])Arrays.stream(currentQuestData.stages).filter(q -> !q.equals(currentData)).toArray():new String[]{}); //May not be the right way to do this, will come back to it.
+
+    JTabbedPane tabs =new JTabbedPane();
+    DialogEditor prologueEditor = new DialogEditor();
+    DialogEditor epilogueEditor = new DialogEditor();
+
+    public QuestStageEdit()
+    {
+        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        add(getInfoTab());
+        add(tabs);
+        tabs.add("Objective", getObjectiveTab());
+        tabs.add("Prologue",getPrologueTab());
+        tabs.add("Epilogue",getEpilogueTab());
+        tabs.add("Prerequisites",getPrereqTab());
+
+        //temp
+        nyi.setForeground(Color.red);
+        //
+
+        addListeners();
+    }
+
+    public JPanel getInfoTab(){
+        JPanel infoTab = new JPanel();
+        FormPanel center=new FormPanel();
+        center.add("name:",name);
+        center.add("description:",description);
+        name.setSize(400, name.getHeight());
+        description.setSize(400, description.getHeight());
+        infoTab.add(center);
+        name.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        description.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        prerequisites.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        return infoTab;
+    }
+
+    public JPanel getPrologueTab(){
+        JPanel prologueTab = new JPanel();
+        prologueTab.setLayout(new BoxLayout(prologueTab, BoxLayout.Y_AXIS));
+        FormPanel center = new FormPanel();
+        center.add(prologueEditor);
+        prologueTab.add(center);
+        return prologueTab;
+    }
+
+    public JPanel getEpilogueTab(){
+        JPanel epilogueTab = new JPanel();
+        epilogueTab.setLayout(new BoxLayout(epilogueTab, BoxLayout.Y_AXIS));
+        FormPanel center = new FormPanel();
+        center.add(epilogueEditor);
+        epilogueTab.add(center);
+        return epilogueTab;
+    }
+
+    private JComboBox<AdventureQuestController.ObjectiveTypes> objectiveType;
+
+    private final JLabel nyi = new JLabel("Not yet implemented");
+    private final JTextField deliveryItem=new JTextField(25);
+    private final JTextField mapFlag = new JTextField(25);
+
+    private Box mapFlagGroup;
+    private final JSpinner flagSpinner = new JSpinner(new SpinnerNumberModel(1, 1, 1000, 1));
+    private Box flagValueGroup;
+    private final JCheckBox anyPOI = new JCheckBox("Any Point of Interest matching");
+    private final JCheckBox here = new JCheckBox("Use current map instead of selecting tags");
+    private final JCheckBox mixedEnemies = new JCheckBox("Mixture of enemy types matching");
+    private final JLabel count1Description = new JLabel("(Count 1 description)");
+    private final JLabel count2Description = new JLabel("(Count 2 description)");
+    private final JLabel count3Description = new JLabel("(Count 3 description)");
+    private final JSpinner count1Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
+    private final JSpinner count2Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
+    private final JSpinner count3Spinner = new JSpinner(new SpinnerNumberModel(1, 0, 100, 1));
+
+    private final JLabel arenaLabel = new JLabel("Enter the arena and prove your worth. (Note: Please be sure the PoIs selected have an arena)");
+    private final JLabel clearLabel = new JLabel("Clear all enemies from the target area.");
+    private final JLabel defeatLabel = new JLabel("Defeat a number of enemies of the indicated type.");
+    private final JLabel deliveryLabel = new JLabel("Travel to the given destination to deliver an item (not tracked in inventory).");
+    private final JLabel escortLabel = new JLabel("Protect your target as they travel to their destination.");
+    private final JLabel fetchLabel = new JLabel("Obtain the requested items (not tracked in inventory).");
+    private final JLabel findLabel = new JLabel("Locate the and enter a PoI.");
+    private final JLabel gatherLabel = new JLabel("Have the requested item in your inventory (tracked in inventory)");
+    private final JLabel giveLabel = new JLabel("Have the requested items removed from your inventory.");
+    private final JLabel haveReputationLabel = new JLabel("Have a minimum reputation in the selected PoI (and enter it)");
+    private final JLabel huntLabel = new JLabel("Track down and defeat your target (on the overworld map).");
+    private final JLabel leaveLabel = new JLabel("Exit the current PoI and return to the overworld map.");
+    private final JLabel noneLabel = new JLabel("No visible objective. Use in coordination with hidden parallel objectives to track when to progress");
+    private final JLabel patrolLabel = new JLabel("Get close to generated coordinates before starting your next objective");
+    private final JLabel rescueLabel = new JLabel("Reach and rescue the target");
+    private final JLabel siegeLabel = new JLabel("Travel to the target location and defeat enemies attacking it");
+    private final JLabel mapFlagLabel = new JLabel("Have a map flag set to a minimum value");
+    private final JLabel questFlagLabel = new JLabel("Have a global quest flag set to a minimum value");
+    private final JLabel travelLabel = new JLabel("Travel to the given destination.");
+    private final JLabel useLabel = new JLabel("Use the indicated item from your inventory.");
+    private JTabbedPane poiPane = new JTabbedPane();
+    private final QuestTagSelector poiSelector = new QuestTagSelector("Destination Tags", false,true);
+    private final QuestTagSelector enemySelector = new QuestTagSelector("Enemy Tags", true,false);
+    private final JTextField poiTokenInput = new JTextField(25);
+
+    private final JLabel poiTokenLabel = new JLabel();
+    private final JLabel poiTokenDescription = new JLabel(
+                 "At the bottom of many objectives involving a PoI, you will see a text field in the format of '$poi_#'." +
+                 "Enter that tag here to ignore the PoI tag selector of this stage and instead use the same PoI that was selected " +
+                 "for that stage as the target PoI for this one as well.");
+
+    private void hideAllControls(){
+        arenaLabel.setVisible(false);
+        clearLabel.setVisible(false);
+        deliveryLabel.setVisible(false);
+        defeatLabel.setVisible(false);
+        escortLabel.setVisible(false);
+        fetchLabel.setVisible(false);
+        findLabel.setVisible(false);
+        gatherLabel.setVisible(false);
+        giveLabel.setVisible(false);
+        haveReputationLabel.setVisible(false);
+        huntLabel.setVisible(false);
+        leaveLabel.setVisible(false);
+        noneLabel.setVisible(false);
+        patrolLabel.setVisible(false);
+        rescueLabel.setVisible(false);
+        siegeLabel.setVisible(false);
+        mapFlagLabel.setVisible(false);
+        questFlagLabel.setVisible(false);
+        travelLabel.setVisible(false);
+        useLabel.setVisible(false);
+        deliveryItem.setVisible(false);
+        mapFlagGroup.setVisible(false);
+        flagValueGroup.setVisible(false);
+        anyPOI.setVisible(false);
+        here.setVisible(false);
+        mixedEnemies.setVisible(false);
+        enemySelector.setVisible(false);
+        count1Description.setVisible(false);
+        count2Description.setVisible(false);
+        count3Description.setVisible(false);
+        count1Spinner.setVisible(false);
+        count2Spinner.setVisible(false);
+        count3Spinner.setVisible(false);
+        poiPane.setVisible(false);
+        poiTokenLabel.setVisible(false);
+        nyi.setVisible(false);
+    }
+    private void switchPanels(){
+        hideAllControls();
+        if (objectiveType.getSelectedItem() == null){
+            return;
+        }
+        switch(objectiveType.getSelectedItem().toString()){
+            case "Arena":
+                arenaLabel.setVisible(true);
+                poiPane.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                break;
+            case "Clear":
+                clearLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                count1Description.setText("Target candidate percentile");
+                count1Description.setVisible(true);
+                count1Spinner.setVisible(true);
+                count2Description.setText("Percent variance");
+                count2Description.setVisible(true);
+                count2Spinner.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                break;
+            case "Defeat":
+                defeatLabel.setVisible(true);
+                mixedEnemies.setVisible(true);
+                count1Description.setText("Number to defeat");
+                count1Description.setVisible(true);
+                count1Spinner.setVisible(true);
+                count2Description.setText("Maximum losses");
+                count2Description.setVisible(true);
+                count2Spinner.setVisible(true);
+                enemySelector.setVisible(true);
+                break;
+            case "Delivery":
+                deliveryLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                deliveryItem.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                break;
+            case "Escort":
+                escortLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                here.setVisible(true);
+                spriteNames.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                break;
+            case "Fetch":
+                fetchLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                deliveryItem.setVisible(true);
+                enemySelector.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                break;
+            case "Find":
+                findLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                anyPOI.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                break;
+            case "Gather":
+                gatherLabel.setVisible(true);
+                gatherLabel.setVisible(true);
+                nyi.setVisible(true);
+                itemNames.setVisible(true);
+                break;
+            case "Give":
+                giveLabel.setVisible(true);
+                nyi.setVisible(true);
+                itemNames.setVisible(true);
+                poiPane.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                here.setVisible(true);
+                break;
+            case "HaveReputation":
+                haveReputationLabel.setVisible(true);
+                poiPane.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                here.setVisible(true);
+                count1Description.setText("Minimum reputation needed");
+                count1Description.setVisible(true);
+                count1Spinner.setVisible(true);
+                count1Spinner.setVisible(true);
+                break;
+            case "Hunt":
+                huntLabel.setVisible(true);
+                enemySelector.setVisible(true);
+                count1Description.setText("Lifespan (seconds to complete hunt before despawn)");
+                count1Description.setVisible(true);
+                count1Spinner.setVisible(true);
+                count1Spinner.setVisible(true);
+                break;
+            case "Leave":
+                leaveLabel.setVisible(true);
+                break;
+            case "None":
+                noneLabel.setVisible(true);
+                nyi.setVisible(true);
+                break;
+            case "Patrol":
+                patrolLabel.setVisible(true);
+                nyi.setVisible(true);
+                break;
+            case "Rescue":
+                rescueLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                anyPOI.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                here.setVisible(true);
+                spriteNames.setVisible(true);
+                enemySelector.setVisible(true);
+                break;
+            case "Siege":
+                siegeLabel.setVisible(true);
+                nyi.setVisible(true);
+                poiPane.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                enemySelector.setVisible(true);
+                mixedEnemies.setVisible(true);
+                break;
+            case "MapFlag":
+                mapFlagLabel.setVisible(true);
+                poiPane.setVisible(true);
+                here.setVisible(true);
+                anyPOI.setVisible(true);
+                mapFlagGroup.setVisible(true);
+                flagValueGroup.setVisible(true);
+                break;
+            case "QuestFlag":
+                questFlagLabel.setVisible(true);
+                mapFlagGroup.setVisible(true);
+                flagValueGroup.setVisible(true);
+                break;
+            case "Travel":
+                travelLabel.setVisible(true);
+                poiPane.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                poiTokenInput.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                count1Description.setText("Target % of possible distances");
+                count1Description.setVisible(true);
+                count1Spinner.setVisible(true);
+                count2Description.setText("Plus or minus %");
+                count2Description.setVisible(true);
+                count2Spinner.setVisible(true);
+                break;
+            case "Use":
+                useLabel.setVisible(true);
+                nyi.setVisible(true);
+                itemNames.setVisible(true);
+                poiPane.setVisible(true);
+                anyPOI.setVisible(true);
+                here.setVisible(true);
+                poiTokenLabel.setVisible(true);
+                here.setVisible(true);
+                break;
+        }
+    }
+
+    private void changeObjective(){
+        if (objectiveType.getSelectedItem() != null)
+            currentData.objective = AdventureQuestController.ObjectiveTypes.valueOf(objectiveType.getSelectedItem().toString());
+        switchPanels();
+    }
+
+    private JPanel getObjectiveTab(){
+        objectiveType = new JComboBox<>(AdventureQuestController.ObjectiveTypes.values());
+        objectiveType.addActionListener( e -> changeObjective());
+
+        JPanel objectiveTab = new JPanel();
+        JScrollPane scrollPane = new JScrollPane();
+        objectiveTab.add(scrollPane);
+        FormPanel center=new FormPanel();
+        center.add(objectiveType);
+        scrollPane.add(center);
+
+        mapFlagGroup = new Box(BoxLayout.Y_AXIS);
+        mapFlagGroup.add(new JLabel("Map flag to check"));
+        mapFlagGroup.add(mapFlag);
+
+        flagValueGroup = new Box(BoxLayout.Y_AXIS);
+        flagValueGroup.add(new JLabel("Flag value to check"));
+        flagValueGroup.add(flagSpinner);
+
+        JPanel poiSelectorPane = new JPanel();
+        poiSelectorPane.setLayout(new BorderLayout());
+        poiSelectorPane.add(poiSelector, BorderLayout.CENTER);
+        JPanel poiTokenPanel = new JPanel();
+
+        JPanel tokenPanel = new JPanel();
+        tokenPanel.add(new JLabel("Token to use:"));
+        tokenPanel.add(poiTokenInput);
+        tokenPanel.setBorder(new EmptyBorder(10, 10, 30, 10));
+
+        poiTokenPanel.add(poiTokenDescription);
+        poiTokenPanel.add(tokenPanel);
+        poiTokenPanel.add(here);
+
+        GroupLayout poiTokenLayout =  new GroupLayout(poiTokenPanel);
+
+
+        poiTokenLayout.setHorizontalGroup(
+            poiTokenLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                            .addComponent(poiTokenDescription)
+                            .addComponent(tokenPanel,GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                                    GroupLayout.PREFERRED_SIZE)
+                            .addComponent(here));
+
+        poiTokenLayout.setVerticalGroup(
+                poiTokenLayout.createSequentialGroup()
+                        .addComponent(poiTokenDescription)
+                        .addComponent(tokenPanel,GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                                GroupLayout.PREFERRED_SIZE)
+                        .addComponent(here));
+
+        poiTokenPanel.setLayout(poiTokenLayout);
+
+        poiPane.add("Specific PoI", poiTokenPanel);
+        poiPane.add("Tag Selector", poiSelectorPane);
+        poiPane.setPreferredSize(new Dimension(0,200));
+
+
+        center.add(arenaLabel);
+        center.add(clearLabel);
+        center.add(defeatLabel);
+        center.add(deliveryLabel);
+        center.add(escortLabel);
+        center.add(fetchLabel);
+        center.add(findLabel);
+        center.add(gatherLabel);
+        center.add(giveLabel);
+        center.add(haveReputationLabel);
+        center.add(huntLabel);
+        center.add(leaveLabel);
+        center.add(noneLabel);
+        center.add(patrolLabel);
+        center.add(rescueLabel);
+        center.add(siegeLabel);
+        center.add(mapFlagLabel);
+        center.add(questFlagLabel);
+        center.add(travelLabel);
+        center.add(useLabel);
+        center.add(nyi);
+        center.add(deliveryItem);
+        center.add(mapFlagGroup);
+        center.add(flagValueGroup);
+        center.add(anyPOI);
+        center.add(mixedEnemies);
+        center.add(enemySelector);
+        center.add(count1Description);
+        center.add(count1Spinner);
+        center.add(count2Description);
+        center.add(count2Spinner);
+        center.add(count3Description);
+        center.add(count3Spinner);
+        center.add(poiPane);
+        center.add(poiTokenLabel);
+
+        switchPanels();
+
+        poiSelector.selectedItems.addListDataListener(new ListDataListener() {
+            @Override
+            public void intervalAdded(ListDataEvent e) {
+                rebuildPOIList();
+                rebuildEnemyList();
+            }
+
+            @Override
+            public void intervalRemoved(ListDataEvent e) {
+                rebuildPOIList();
+                rebuildEnemyList();
+            }
+
+            @Override
+            public void contentsChanged(ListDataEvent e) {
+                rebuildPOIList();
+                rebuildEnemyList();
+            }
+        });
+
+        return center;
+    }
+
+    private void rebuildPOIList(){
+        List<String> currentList = new ArrayList<>();
+
+        for(int i = 0; i< poiSelector.selectedItems.getSize(); i++){
+            currentList.add(poiSelector.selectedItems.getElementAt(i));
+        }
+        currentData.POITags = currentList;
+    }
+
+    private void rebuildEnemyList(){
+        List<String> currentList = new ArrayList<>();
+
+        for(int i = 0; i< enemySelector.selectedItems.getSize(); i++){
+            currentList.add(enemySelector.selectedItems.getElementAt(i));
+        }
+        currentData.enemyTags = currentList;
+    }
+
+    private JPanel getPrereqTab(){
+        JPanel prereqTab = new JPanel();
+        prereqTab.add(new JLabel("Insert Prereq data here"));
+
+        return prereqTab;
+    }
+
+    private void refresh() {
+
+        if(currentData==null)
+        {
+            return;
+        }
+        setEnabled(false);
+        updating=true;
+        objectiveType.setSelectedItem(currentData.objective);
+        if (objectiveType.getSelectedItem() != null)
+            currentData.objective = AdventureQuestController.ObjectiveTypes.valueOf(objectiveType.getSelectedItem().toString()); //Ensuring this gets initialized on new
+
+        name.setText(currentData.name);
+        description.setText(currentData.description);
+        deliveryItem.setText(currentData.deliveryItem);
+
+        if (currentData.enemyTags != null){
+            DefaultListModel<String> selectedEnemies = new DefaultListModel<>();
+            for (int i = 0; i < currentData.enemyTags.size(); i++) {
+                selectedEnemies.add(i, currentData.enemyTags.get(i));
+            }
+            enemySelector.load(selectedEnemies);
+        }
+        if (currentData.POITags != null){
+            DefaultListModel<String> selectedPOI = new DefaultListModel<>();
+            for (int i = 0; i < currentData.POITags.size(); i++) {
+                selectedPOI.add(i, currentData.POITags.get(i));
+            }
+            poiSelector.load(selectedPOI);
+        }
+
+        itemNames.setText(currentData.itemNames);
+        equipNames.setText(currentData.equipNames);
+        prologueEditor.loadData(currentData.prologue);
+        epilogueEditor.loadData(currentData.epilogue);
+
+
+        if (currentData.POITags != null){
+            DefaultListModel<String> selectedPOI = new DefaultListModel<>();
+            for (int i = 0; i < currentData.POITags.size(); i++) {
+                selectedPOI.add(i, currentData.POITags.get(i));
+            }
+            poiSelector.load(selectedPOI);
+        }
+        here.getModel().setSelected(currentData.here);
+        poiTokenInput.setText(currentData.POIToken);
+        poiTokenLabel.setText( "To reference this point of interest: $(poi_" + currentData.id + ")");
+
+        ArrayList<String> temp = new ArrayList<>();
+        for (AdventureQuestStage stage : currentQuestData.stages){
+            if (stage.equals(currentData))
+                continue;
+            temp.add(stage.name);
+        }
+        prerequisites.setOptions(temp);
+
+        count1Spinner.getModel().setValue(currentData.count1);
+        count2Spinner.getModel().setValue(currentData.count2);
+        count3Spinner.getModel().setValue(currentData.count3);
+
+        updating=false;
+        setEnabled(true);
+    }
+    public void updateStage()
+    {
+        if(currentData==null||updating)
+            return;
+
+        currentData.name=name.getText();
+        currentData.description= description.getText();
+        currentData.prologue = prologueEditor.getDialogData();
+        currentData.epilogue = epilogueEditor.getDialogData();
+        currentData.deliveryItem = deliveryItem.getText();
+        currentData.itemNames = itemNames.getList()==null?new ArrayList<>():Arrays.asList(itemNames.getList());
+        currentData.equipNames = equipNames.getList()==null?new ArrayList<>():Arrays.asList(equipNames.getList());
+        currentData.anyPOI = anyPOI.getModel().isSelected();
+        currentData.mapFlag = mapFlag.getText();
+        currentData.mapFlagValue = Integer.parseInt(flagSpinner.getModel().getValue().toString());
+        currentData.count1 = Integer.parseInt(count1Spinner.getModel().getValue().toString());
+        currentData.count2 = Integer.parseInt(count2Spinner.getModel().getValue().toString());
+        currentData.count3 = Integer.parseInt(count3Spinner.getModel().getValue().toString());
+        currentData.mixedEnemies = mixedEnemies.getModel().isSelected();
+        currentData.here = here.getModel().isSelected();
+        currentData.POIToken = poiTokenInput.getText();
+
+        rebuildPOIList();
+        rebuildEnemyList();
+        emitChanged();
+    }
+    public void setCurrentStage(AdventureQuestStage stageData, AdventureQuestData data) {
+        if (stageData == null)
+            stageData = new AdventureQuestStage();
+        if (data == null)
+            data = new AdventureQuestData();
+        currentData =stageData;
+        currentQuestData=data;
+        setVisible(true);
+        refresh();
+    }
+
+    public void addChangeListener(ChangeListener listener) {
+        listenerList.add(ChangeListener.class, listener);
+    }
+    protected void emitChanged() {
+        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
+        if (listeners != null && listeners.length > 0) {
+            ChangeEvent evt = new ChangeEvent(this);
+            for (ChangeListener listener : listeners) {
+                listener.stateChanged(evt);
+            }
+        }
+    }
+
+    private void addListeners(){
+        deliveryItem.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        mapFlag.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        flagSpinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        count1Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        count2Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        count3Spinner.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        mixedEnemies.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        here.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        anyPOI.getModel().addChangeListener(q -> QuestStageEdit.this.updateStage());
+        deliveryItem.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        mapFlag.getDocument().addDocumentListener(new DocumentChangeListener(QuestStageEdit.this::updateStage));
+        prologueEditor.addChangeListener(q -> QuestStageEdit.this.updateStage());
+        epilogueEditor.addChangeListener(q -> QuestStageEdit.this.updateStage());
+    }
+}

forge-adventure/src/main/java/forge/adventure/editor/QuestStageEditor.java

@@ -26,8 +26,9 @@ public class QuestStageEditor extends JComponent{
                 JList list, Object value, int index,
                 boolean isSelected, boolean cellHasFocus) {
             JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(!(value instanceof AdventureQuestStage stageData))
+            if(!(value instanceof AdventureQuestStage))
                 return label;
+            AdventureQuestStage stageData=(AdventureQuestStage) value;
             label.setText(stageData.name);
             //label.setIcon(new ImageIcon(Config.instance().getFilePath(stageData.sourcePath))); //Type icon eventually?
             return label;

forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java

@@ -25,10 +25,10 @@ public class RewardEdit extends FormPanel {
     TextListEdit colors =new TextListEdit(new String[] { "White", "Blue", "Black", "Red", "Green" });
     TextListEdit rarity =new TextListEdit(new String[] { "Basic Land", "Common", "Uncommon", "Rare", "Mythic Rare" });
     TextListEdit subTypes =new TextListEdit();
-    TextListEdit cardTypes =new TextListEdit(Arrays.stream(CardType.CoreType.values()).map(CardType.CoreType::toString).toArray(String[]::new));
-    TextListEdit superTypes =new TextListEdit(Arrays.stream(CardType.Supertype.values()).map(CardType.Supertype::toString).toArray(String[]::new));
+    TextListEdit cardTypes =new TextListEdit(Arrays.asList(CardType.CoreType.values()).stream().map(CardType.CoreType::toString).toArray(String[]::new));
+    TextListEdit superTypes =new TextListEdit(Arrays.asList(CardType.Supertype.values()).stream().map(CardType.Supertype::toString).toArray(String[]::new));
     TextListEdit manaCosts =new TextListEdit();
-    TextListEdit keyWords =new TextListEdit(Arrays.stream(Keyword.values()).map(Keyword::toString).toArray(String[]::new));
+    TextListEdit keyWords =new TextListEdit(Arrays.asList(Keyword.values()).stream().map(Keyword::toString).toArray(String[]::new));
     JComboBox colorType =new JComboBox(new String[] { "Any", "Colorless", "MultiColor", "MonoColor"});
     JTextField cardText =new JTextField();
     private boolean updating=false;
@@ -58,18 +58,18 @@ public class RewardEdit extends FormPanel {
         probability.addChangeListener(e -> RewardEdit.this.updateReward());
         count.addChangeListener(e -> RewardEdit.this.updateReward());
         addMaxCount.addChangeListener(e -> RewardEdit.this.updateReward());
-        cardName.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        itemName.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        editions.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        colors.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        rarity.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        subTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        cardTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        superTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        manaCosts.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-        keyWords.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
+        cardName.getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        itemName.getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        editions.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        colors.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        rarity.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        subTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        cardTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        superTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        manaCosts.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
+        keyWords.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
         colorType.addActionListener((e -> RewardEdit.this.updateReward()));
-        cardText.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
+        cardText.getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward()));
 
     }
 
@@ -122,7 +122,7 @@ public class RewardEdit extends FormPanel {
         updating=true;
         typeField.setSelectedItem(currentData.type);
 
-        probability.setValue((double) currentData.probability);
+        probability.setValue(new Double(currentData.probability));
         count.setValue(currentData.count);
         addMaxCount.setValue(currentData.addMaxCount);
         cardName.setText(currentData.cardName);

forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java

@@ -68,7 +68,12 @@ public class StructureEditor extends JComponent{
         add(edit,BorderLayout.CENTER);
 
 
-        edit.addChangeListener(e -> emitChanged());
+        edit.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                emitChanged();
+            }
+        });
     }
     protected void emitChanged() {
         ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);

forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java

@@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.utils.Array;
 
 import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
+import javax.swing.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,7 +65,7 @@ public class SwingAtlas {
             return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance((int) (imageSize*(sprite.width/(float)sprite.height)),imageSize,SCALE_FAST));
 
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             return null;
         }

forge-adventure/src/main/java/forge/adventure/editor/TerrainsEditor.java

@@ -3,17 +3,10 @@ package forge.adventure.editor;
 import forge.adventure.data.BiomeData;
 import forge.adventure.data.BiomeTerrainData;
 
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JToolBar;
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
+import java.awt.*;
 import java.awt.event.ActionListener;
 
 /**
@@ -36,11 +29,11 @@ public class TerrainsEditor extends JComponent{
             if(!(value instanceof BiomeTerrainData))
                 return label;
             BiomeTerrainData terrainData=(BiomeTerrainData) value;
-            /*StringBuilder builder=new StringBuilder();
+            StringBuilder builder=new StringBuilder();
             builder.append("Terrain");
             builder.append(" ");
-            builder.append(terrainData.spriteName);*/
-            label.setText("Terrain " + terrainData.spriteName);
+            builder.append(terrainData.spriteName);
+            label.setText(builder.toString());
             return label;
         }
     }
@@ -67,7 +60,12 @@ public class TerrainsEditor extends JComponent{
         add(edit,BorderLayout.CENTER);
 
 
-        edit.addChangeListener(e -> emitChanged());
+        edit.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                emitChanged();
+            }
+        });
     }
     protected void emitChanged() {
         ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);

forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java

@@ -9,6 +9,8 @@ import forge.adventure.util.Config;
 import forge.adventure.util.Paths;
 
 import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
@@ -43,8 +45,9 @@ public class WorldEditor extends JComponent {
                 JList list, Object value, int index,
                 boolean isSelected, boolean cellHasFocus) {
             JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(!(value instanceof BiomeData biome))
+            if(!(value instanceof BiomeData))
                 return label;
+            BiomeData biome=(BiomeData) value;
             // Get the renderer component from parent class
 
             label.setText(biome.name);
@@ -78,7 +81,12 @@ public class WorldEditor extends JComponent {
 
     public WorldEditor() {
         list.setCellRenderer(new BiomeDataRenderer());
-        list.addListSelectionListener(e -> WorldEditor.this.updateBiome());
+        list.addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                WorldEditor.this.updateBiome();
+            }
+        });
         BorderLayout layout = new BorderLayout();
         setLayout(layout);
         add(tabs);

forge-ai/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>${revision}</version>
+        <version>1.6.57</version>
     </parent>
 
     <artifactId>forge-ai</artifactId>

forge-ai/src/main/java/forge/ai/AIDeckStatistics.java

@@ -0,0 +1,126 @@
+package forge.ai;
+
+import forge.card.CardRules;
+import forge.card.CardType;
+import forge.deck.CardPool;
+import forge.deck.Deck;
+import forge.deck.DeckSection;
+import forge.game.card.Card;
+import forge.game.player.Player;
+import forge.item.PaperCard;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class AIDeckStatistics {
+
+    public float averageCMC = 0;
+    // TODO implement this. Use a numerically stable algorithm from
+    // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Weighted_incremental_algorithm
+    public float stddevCMC = 0;
+    public int maxCost = 0;
+    public int maxColoredCost = 0;
+
+    // in WUBRGC order from ManaCost.getColorShardCounts()
+    public int[] maxPips = null;
+//    public int[] numSources = new int[6];
+    public int numLands = 0;
+    public AIDeckStatistics(float averageCMC, float stddevCMC, int maxCost, int maxColoredCost, int[] maxPips, int numLands) {
+        this.averageCMC = averageCMC;
+        this.stddevCMC = stddevCMC;
+        this.maxCost = maxCost;
+        this.maxColoredCost = maxColoredCost;
+        this.maxPips = maxPips;
+        this.numLands = numLands;
+    }
+
+    public static AIDeckStatistics fromCards(List<Card> cards) {
+        int totalCMC = 0;
+        int totalCount = 0;
+        int numLands = 0;
+        int maxCost = 0;
+        int[] maxPips = new int[6];
+        int maxColoredCost = 0;
+        for (Card c : cards) {
+            CardRules rules = c.getRules();
+            if (rules == null) {
+                System.err.println(c + " CardRules is null" + (c.isToken() ? "/token" : "."));
+                continue;
+            }
+            CardType type = rules.getType();
+            if (type.isLand()) {
+                numLands += 1;
+            } else {
+                int cost = rules.getManaCost().getCMC();
+                // TODO use alternate casting costs for this, free spells will usually be cast for free
+                maxCost = Math.max(maxCost, cost);
+                totalCMC += cost;
+                totalCount++;
+                int[] pips = rules.getManaCost().getColorShardCounts();
+                int colored_pips = 0;
+                for (int i = 0; i < pips.length; i++) {
+                    maxPips[i] = Math.max(maxPips[i], pips[i]);
+                    if (i < 5) {
+                        colored_pips += pips[i];
+                    }
+                }
+                maxColoredCost = Math.max(maxColoredCost, colored_pips);
+            }
+
+            // TODO implement the number of mana sources
+            // find the sources
+            // What about non-mana-ability mana sources?
+            // fetchlands, ramp spells, etc
+
+        }
+
+        return new AIDeckStatistics(totalCount == 0 ? 0 : totalCMC / (float)totalCount,
+                0, // TODO use https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance
+                maxCost,
+                maxColoredCost,
+                maxPips,
+                numLands
+                );
+    }
+
+
+    public static AIDeckStatistics fromDeck(Deck deck, Player player) {
+        List<Card> cardlist = new ArrayList<>();
+        for (final Map.Entry<DeckSection, CardPool> deckEntry : deck) {
+            switch (deckEntry.getKey()) {
+                case Main:
+                case Commander:
+                    for (final Map.Entry<PaperCard, Integer> poolEntry : deckEntry.getValue()) {
+                        Card card = Card.fromPaperCard(poolEntry.getKey(), player);
+                        cardlist.add(card);
+                    }
+                    break;
+                default:
+                    break; //ignore other sections
+            }
+        }
+
+        return fromCards(cardlist);
+    }
+
+    public static AIDeckStatistics fromPlayer(Player player) {
+        Deck deck = player.getRegisteredPlayer().getDeck();
+        if (deck.isEmpty()) {
+            // we're in a test or some weird match, search through the hand and library and build the decklist
+            List<Card> cardlist = new ArrayList<>();
+            for (Card c : player.getAllCards()) {
+                if (c.getPaperCard() == null) {
+                    continue;
+                }
+                cardlist.add(c);
+            }
+
+            return fromCards(cardlist);
+        }
+
+        return fromDeck(deck, player);
+
+    }
+
+}

forge-ai/src/main/java/forge/ai/AiAttackController.java

@@ -17,6 +17,8 @@
  */
 package forge.ai;
 
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.ai.ability.AnimateAi;
@@ -30,28 +32,23 @@ import forge.game.combat.CombatUtil;
 import forge.game.combat.GlobalAttackRestrictions;
 import forge.game.cost.Cost;
 import forge.game.keyword.Keyword;
-import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
 import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityPredicates;
 import forge.game.staticability.StaticAbility;
 import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
-import forge.game.staticability.StaticAbilityMode;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
-import forge.util.*;
+import forge.util.Aggregates;
+import forge.util.Expressions;
+import forge.util.MyRandom;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
-import java.util.function.Predicate;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -76,9 +73,6 @@ public class AiAttackController {
 
     private int aiAggression = 0; // how aggressive the ai is attack will be depending on circumstances
     private final boolean nextTurn; // include creature that can only attack/block next turn
-    private final int timeOut;
-    private final boolean canUseTimeout;
-    private List<CompletableFuture<Integer>> futures = new ArrayList<>();
 
     /**
      * <p>
@@ -96,8 +90,6 @@ public class AiAttackController {
         myList = ai.getCreaturesInPlay();
         this.nextTurn = nextTurn;
         refreshCombatants(defendingOpponent);
-        this.timeOut = ai.getGame().getAITimeout();
-        this.canUseTimeout = ai.getGame().canUseTimeout();
     } // overloaded constructor to evaluate attackers that should attack next turn
 
     public AiAttackController(final Player ai, Card attacker) {
@@ -111,13 +103,11 @@ public class AiAttackController {
             attackers.add(attacker);
         }
         this.blockers = getPossibleBlockers(oppList, this.attackers, this.nextTurn);
-        this.timeOut = ai.getGame().getAITimeout();
-        this.canUseTimeout = ai.getGame().canUseTimeout();
     } // overloaded constructor to evaluate single specified attacker
 
     private void refreshCombatants(GameEntity defender) {
-        if (defender instanceof Card card && card.isBattle()) {
-            this.oppList = getOpponentCreatures(card.getProtectingPlayer());
+        if (defender instanceof Card && ((Card) defender).isBattle()) {
+            this.oppList = getOpponentCreatures(((Card) defender).getProtectingPlayer());
         } else {
             this.oppList = getOpponentCreatures(defendingOpponent);
         }
@@ -134,16 +124,21 @@ public class AiAttackController {
         List<Card> defenders = defender.getCreaturesInPlay();
         int totalMana = ComputerUtilMana.getAvailableManaEstimate(defender, true);
         int manaReserved = 0; // for paying the cost to transform
-        Predicate<Card> canAnimate = c -> !c.isTapped() && !c.isCreature() && !c.isPlaneswalker();
+        Predicate<Card> canAnimate = new Predicate<Card>() {
+            @Override
+            public boolean apply(Card c) {
+                return !c.isTapped() && !c.isCreature() && !c.isPlaneswalker();
+            }
+        };
 
         CardCollection tappedDefenders = new CardCollection();
         for (Card c : CardLists.filter(defender.getCardsIn(ZoneType.Battlefield), canAnimate)) {
-            for (SpellAbility sa : IterableUtil.filter(c.getSpellAbilities(), SpellAbilityPredicates.isApi(ApiType.Animate))) {
+            for (SpellAbility sa : Iterables.filter(c.getSpellAbilities(), SpellAbilityPredicates.isApi(ApiType.Animate))) {
                 if (sa.usesTargeting() || !sa.getParamOrDefault("Defined", "Self").equals("Self")) {
                     continue;
                 }
                 sa.setActivatingPlayer(defender);
-                if (sa.isCrew() && !ComputerUtilCost.checkTapTypeCost(defender, sa.getPayCosts(), c, sa, tappedDefenders)) {
+                if (sa.hasParam("Crew") && !ComputerUtilCost.checkTapTypeCost(defender, sa.getPayCosts(), c, sa, tappedDefenders)) {
                     continue;
                 } else if (!ComputerUtilCost.canPayCost(sa, defender, false) || !sa.getRestrictions().checkOtherRestrictions(c, sa, defender)) {
                     continue;
@@ -162,7 +157,7 @@ public class AiAttackController {
             defenders.removeAll(tappedDefenders);
 
             // Transform (e.g. Incubator tokens)
-            for (SpellAbility sa : IterableUtil.filter(c.getSpellAbilities(), SpellAbilityPredicates.isApi(ApiType.SetState))) {
+            for (SpellAbility sa : Iterables.filter(c.getSpellAbilities(), SpellAbilityPredicates.isApi(ApiType.SetState))) {
                 Card transformedCopy = ComputerUtilCombat.canTransform(c);
                 if (transformedCopy.isCreature()) {
                     int saCMC = sa.getPayCosts() != null && sa.getPayCosts().hasManaCost() ?
@@ -178,7 +173,7 @@ public class AiAttackController {
     }
 
     public void removeBlocker(Card blocker) {
-        this.oppList.remove(blocker);
+    	this.oppList.remove(blocker);
         this.blockers.remove(blocker);
     }
 
@@ -295,7 +290,7 @@ public class AiAttackController {
         }
 
         if ("TRUE".equals(attacker.getSVar("HasAttackEffect"))) {
-            return true;
+        	return true;
         }
 
         // Damage opponent if unblocked
@@ -313,8 +308,7 @@ public class AiAttackController {
             }
         }
         // Poison opponent if unblocked
-        if (defender instanceof Player player
-                && ComputerUtilCombat.poisonIfUnblocked(attacker, player) > 0) {
+        if (defender instanceof Player && ComputerUtilCombat.poisonIfUnblocked(attacker, (Player) defender) > 0) {
             return true;
         }
 
@@ -337,7 +331,12 @@ public class AiAttackController {
     }
 
     public final static List<Card> getPossibleBlockers(final List<Card> blockers, final List<Card> attackers, final boolean nextTurn) {
-        return CardLists.filter(blockers, c -> canBlockAnAttacker(c, attackers, nextTurn));
+        return CardLists.filter(blockers, new Predicate<Card>() {
+            @Override
+            public boolean apply(final Card c) {
+                return canBlockAnAttacker(c, attackers, nextTurn);
+            }
+        });
     }
 
     public final static boolean canBlockAnAttacker(final Card c, final List<Card> attackers, final boolean nextTurn) {
@@ -396,10 +395,15 @@ public class AiAttackController {
             }
         }
         // reduce the search space
-        final List<Card> opponentsAttackers = CardLists.filter(ai.getOpponents().getCreaturesInPlay(), c -> !c.hasSVar("EndOfTurnLeavePlay")
-                && (c.toughnessAssignsDamage() || c.getNetCombatDamage() > 0 // performance shortcuts
-                || c.getNetCombatDamage() + ComputerUtilCombat.predictPowerBonusOfAttacker(c, null, null, true) > 0)
-                && ComputerUtilCombat.canAttackNextTurn(c));
+        final List<Card> opponentsAttackers = CardLists.filter(ai.getOpponents().getCreaturesInPlay(), new Predicate<Card>() {
+            @Override
+            public boolean apply(final Card c) {
+                return !c.hasSVar("EndOfTurnLeavePlay")
+                        && (c.toughnessAssignsDamage() || c.getNetCombatDamage() > 0 // performance shortcuts
+                                || c.getNetCombatDamage() + ComputerUtilCombat.predictPowerBonusOfAttacker(c, null, null, true) > 0)
+                        && ComputerUtilCombat.canAttackNextTurn(c);
+            }
+        });
 
         // don't hold back creatures that can't block any of the human creatures
         final List<Card> blockers = getPossibleBlockers(potentialAttackers, opponentsAttackers, true);
@@ -520,9 +524,13 @@ public class AiAttackController {
             return;
         }
 
+        List<String> bandsWithString = Arrays.asList("Bands with Other Legendary Creatures",
+                "Bands with Other Creatures named Wolves of the Hunt",
+                "Bands with Other Dinosaurs");
+
         List<Card> bandingCreatures = null;
         if (test == null) {
-            bandingCreatures = CardLists.filter(myList, card -> card.hasKeyword(Keyword.BANDING) || card.hasKeyword(Keyword.BANDSWITH));
+            bandingCreatures = CardLists.filter(myList, card -> card.hasKeyword(Keyword.BANDING) || card.hasAnyKeyword(bandsWithString));
 
             // filter out anything that can't legally attack or is already declared as an attacker
             bandingCreatures = CardLists.filter(bandingCreatures, card -> !combat.isAttacking(card) && CombatUtil.canAttack(card));
@@ -530,7 +538,7 @@ public class AiAttackController {
             bandingCreatures = notNeededAsBlockers(attackers, bandingCreatures);
         } else {
             // Test a specific creature for Banding
-            if (test.hasKeyword(Keyword.BANDING) || test.hasKeyword(Keyword.BANDSWITH)) {
+            if (test.hasKeyword(Keyword.BANDING) || test.hasAnyKeyword(bandsWithString)) {
                 bandingCreatures = new CardCollection(test);
             }
         }
@@ -543,12 +551,12 @@ public class AiAttackController {
         }
 
         if (bandingCreatures != null) {
-            List<String> evasionKeywords = Arrays.asList("Flying", "Horsemanship", "Shadow", "Landwalk:Plains", "Landwalk:Island",
-                    "Landwalk:Forest", "Landwalk:Mountain", "Landwalk:Swamp");
+            List<String> evasionKeywords = Arrays.asList("Flying", "Horsemanship", "Shadow", "Plainswalk", "Islandwalk",
+                    "Forestwalk", "Mountainwalk", "Swampwalk");
 
             // TODO: Assign to band with the best attacker for now, but needs better logic.
             for (Card c : bandingCreatures) {
-                Card bestBand = null;
+                Card bestBand;
 
                 if (c.getNetPower() <= 0) {
                     // Don't band a zero power creature if there's already a banding creature in a band
@@ -556,16 +564,12 @@ public class AiAttackController {
                 }
 
                 Card bestAttacker = ComputerUtilCard.getBestCreatureAI(attackers);
-
-                // TODO how should this work with multiple bands with other abilities?
-                if (c.hasKeyword(Keyword.BANDSWITH)) {
-                    for (KeywordInterface kw : c.getKeywords(Keyword.BANDSWITH)) {
-                        final String o = kw.getOriginal();
-                        String m[] = o.split(":");
-                        CardCollection bandPartner = CardLists.getValidCards(attackers, m[1], c.getController(), c, null);
-                        bestBand = ComputerUtilCard.getBestCreatureAI(bandPartner);
-                        break; // ?
-                    }
+                if (c.hasKeyword("Bands with Other Legendary Creatures")) {
+                    bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.getType(attackers, "Legendary"));
+                } else if (c.hasKeyword("Bands with Other Dinosaurs")) {
+                    bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.getType(attackers, "Dinosaur"));
+                } else if (c.hasKeyword("Bands with Other Creatures named Wolves of the Hunt")) {
+                    bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.filter(attackers, CardPredicates.nameEquals("Wolves of the Hunt")));
                 } else if (!c.hasAnyKeyword(evasionKeywords) && bestAttacker != null && bestAttacker.hasAnyKeyword(evasionKeywords)) {
                     bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.filter(attackers, card -> !card.hasAnyKeyword(evasionKeywords)));
                 } else {
@@ -625,9 +629,9 @@ public class AiAttackController {
             // TODO: the AI should ideally predict how many times it can activate
             // for now, unless the opponent is tapped out, break at this point
             // and do not predict the blocker limit (which is safer)
-            if (defendingOpponent.getLandsInPlay().anyMatch(CardPredicates.UNTAPPED)) {
+            if (Iterables.any(defendingOpponent.getLandsInPlay(), CardPredicates.Presets.UNTAPPED)) {
                 maxBlockersAfterCrew += CardLists.count(CardLists.getNotType(defendingOpponent.getCardsIn(ZoneType.Battlefield), "Creature"),
-                        CardPredicates.isType("Vehicle").and(CardPredicates.UNTAPPED));
+                        Predicates.and(CardPredicates.isType("Vehicle"), CardPredicates.Presets.UNTAPPED));
             }
         }
 
@@ -657,9 +661,11 @@ public class AiAttackController {
             if (!CombatUtil.canBeBlocked(attacker, accountedBlockers, null)
                     || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)) {
                 unblockedAttackers.add(attacker);
-            } else if (predictEvasion) {
-                List<Card> potentialBestBlockers = CombatUtil.getPotentialBestBlockers(attacker, accountedBlockers, null);
-                accountedBlockers.removeAll(potentialBestBlockers);
+            } else {
+                if (predictEvasion) {
+                    List<Card> potentialBestBlockers = CombatUtil.getPotentialBestBlockers(attacker, accountedBlockers, null);
+                    accountedBlockers.removeAll(potentialBestBlockers);
+                }
             }
         }
 
@@ -766,7 +772,7 @@ public class AiAttackController {
         return false;
     }
 
-    private Pair<Integer, Integer> getDamageFromBlockingTramplers(final List<Card> blockedAttackers, final List<Card> blockers, final int myFreeMana) {
+    private final Pair<Integer, Integer> getDamageFromBlockingTramplers(final List<Card> blockedAttackers, final List<Card> blockers, final int myFreeMana) {
         int currentAttackTax = 0;
         int trampleDamage = 0;
         CardCollection remainingBlockers = new CardCollection(blockers);
@@ -793,7 +799,7 @@ public class AiAttackController {
         return Pair.of(trampleDamage, currentAttackTax);
     }
 
-    private GameEntity chooseDefender(final Combat c, final boolean bAssault) {
+    private final GameEntity chooseDefender(final Combat c, final boolean bAssault) {
         final FCollectionView<GameEntity> defs = c.getDefenders();
         if (defs.size() == 1) {
             return defs.getFirst();
@@ -804,7 +810,6 @@ public class AiAttackController {
         if (bAssault) {
             return prefDefender;
         }
-
         // 2. attack planeswalkers
         List<Card> pwDefending = c.getDefendingPlaneswalkers();
         if (!pwDefending.isEmpty()) {
@@ -812,7 +817,7 @@ public class AiAttackController {
             return pwNearUlti != null ? pwNearUlti : ComputerUtilCard.getBestPlaneswalkerAI(pwDefending);
         }
 
-        // 3. Get the preferred battle (prefer own battles, then ally battles)
+        // Get the preferred battle (prefer own battles, then ally battles)
         final CardCollection defBattles = c.getDefendingBattles();
         List<Card> ownBattleDefending = CardLists.filter(defBattles, CardPredicates.isController(ai));
         List<Card> allyBattleDefending = CardLists.filter(defBattles, CardPredicates.isControlledByAnyOf(ai.getAllies()));
@@ -851,9 +856,10 @@ public class AiAttackController {
         // decided to attack another defender so related lists need to be updated
         // (though usually rather try to avoid this situation for performance reasons)
         if (defender != defendingOpponent) {
-            if (defender instanceof Player p) {
-                defendingOpponent = p;
-            } else if (defender instanceof Card defCard) {
+            if (defender instanceof Player) {
+                defendingOpponent = (Player) defender;
+            } else if (defender instanceof Card) {
+                Card defCard = (Card) defender;
                 if (defCard.isBattle()) {
                     defendingOpponent = defCard.getProtectingPlayer();
                 } else {
@@ -893,7 +899,7 @@ public class AiAttackController {
         // TODO: detect Season of the Witch by presence of a card with a specific trigger
         final boolean seasonOfTheWitch = ai.getGame().isCardInPlay("Season of the Witch");
 
-        final Queue<Card> attackersLeft = new ConcurrentLinkedQueue<>(this.attackers);
+        List<Card> attackersLeft = new ArrayList<>(this.attackers);
 
         // TODO probably use AttackConstraints instead of only GlobalAttackRestrictions?
         GlobalAttackRestrictions restrict = GlobalAttackRestrictions.getGlobalRestrictions(ai, combat.getDefenders());
@@ -909,35 +915,35 @@ public class AiAttackController {
         }
 
         // Attackers that don't really have a choice
-        final AtomicInteger numForcedAttackers = new AtomicInteger(0);
+        int numForcedAttackers = 0;
         // nextTurn is now only used by effect from Oracle en-Vec, which can skip check must attack,
         // because creatures not chosen can't attack.
         if (!nextTurn) {
             for (final Card attacker : this.attackers) {
-                final GameEntity finalDefender = defender;
-                futures.add(CompletableFuture.supplyAsync(()-> {
-                    GameEntity mustAttackDef = null;
-                    if (attacker.getSVar("MustAttack").equals("True")) {
-                        mustAttackDef = finalDefender;
-                    } else if (attacker.hasSVar("EndOfTurnLeavePlay")
-                            && isEffectiveAttacker(ai, attacker, combat, finalDefender)) {
-                        mustAttackDef = finalDefender;
-                    } else if (seasonOfTheWitch) {
-                        //TODO: if there are other ways to tap this creature (like mana creature), then don't need to attack
-                        mustAttackDef = finalDefender;
-                    } else {
-                        if (combat.getAttackConstraints().getRequirements().get(attacker) == null) return 0;
-                        // check defenders in order of maximum requirements
-                        List<Pair<GameEntity, Integer>> reqs = combat.getAttackConstraints().getRequirements().get(attacker).getSortedRequirements();
-                        final GameEntity def = finalDefender;
-                        reqs.sort((r1, r2) -> {
+                GameEntity mustAttackDef = null;
+                if (attacker.getSVar("MustAttack").equals("True")) {
+                    mustAttackDef = defender;
+                } else if (attacker.hasSVar("EndOfTurnLeavePlay")
+                        && isEffectiveAttacker(ai, attacker, combat, defender)) {
+                    mustAttackDef = defender;
+                } else if (seasonOfTheWitch) {
+                    //TODO: if there are other ways to tap this creature (like mana creature), then don't need to attack
+                    mustAttackDef = defender;
+                } else {
+                    if (combat.getAttackConstraints().getRequirements().get(attacker) == null) continue;
+                    // check defenders in order of maximum requirements
+                    List<Pair<GameEntity, Integer>> reqs = combat.getAttackConstraints().getRequirements().get(attacker).getSortedRequirements();
+                    final GameEntity def = defender;
+                    Collections.sort(reqs, new Comparator<Pair<GameEntity, Integer>>() {
+                        @Override
+                        public int compare(Pair<GameEntity, Integer> r1, Pair<GameEntity, Integer> r2) {
                             if (r1.getValue() == r2.getValue()) {
                                 // try to attack the designated defender
                                 if (r1.getKey().equals(def) && !r2.getKey().equals(def)) {
                                     return -1;
                                 }
                                 if (r2.getKey().equals(def) && !r1.getKey().equals(def)) {
-                                    return 1;
+                                    return 1;    
                                 }
                                 // otherwise PW
                                 if (r1.getKey() instanceof Card && r2.getKey() instanceof Player) {
@@ -947,38 +953,28 @@ public class AiAttackController {
                                     return 1;
                                 }
                                 // or weakest player
-                                if (r1.getKey() instanceof Player p1 && r2.getKey() instanceof Player p2) {
-                                    return p1.getLife() - p2.getLife();
+                                if (r1.getKey() instanceof Player && r2.getKey() instanceof Player) {
+                                    return ((Player) r1.getKey()).getLife() - ((Player) r2.getKey()).getLife();
                                 }
                             }
                             return r2.getValue() - r1.getValue();
-                        });
-                        for (Pair<GameEntity, Integer> e : reqs) {
-                            if (e.getRight() == 0) continue;
-                            GameEntity mustAttackDefMaybe = e.getLeft();
-                            if (canAttackWrapper(attacker, mustAttackDefMaybe) && CombatUtil.getAttackCost(ai.getGame(), attacker, mustAttackDefMaybe) == null) {
-                                mustAttackDef = mustAttackDefMaybe;
-                                break;
-                            }
+                        }
+                    });
+                    for (Pair<GameEntity, Integer> e : reqs) {
+                        if (e.getRight() == 0) continue;
+                        GameEntity mustAttackDefMaybe = e.getLeft();
+                        if (canAttackWrapper(attacker, mustAttackDefMaybe) && CombatUtil.getAttackCost(ai.getGame(), attacker, mustAttackDefMaybe) == null) {
+                            mustAttackDef = mustAttackDefMaybe;
+                            break;
                         }
                     }
-                    if (mustAttackDef != null) {
-                        combat.addAttacker(attacker, mustAttackDef);
-                        attackersLeft.remove(attacker);
-                        numForcedAttackers.incrementAndGet();
-                    }
-                    return 0;
-                }).exceptionally(ex -> {
-                    ex.printStackTrace();
-                    return 0;
-                }));
+                }
+                if (mustAttackDef != null) {
+                    combat.addAttacker(attacker, mustAttackDef);
+                    attackersLeft.remove(attacker);
+                    numForcedAttackers++;
+                }
             }
-            CompletableFuture<?>[] futuresArray = futures.toArray(new CompletableFuture<?>[0]);
-            if (canUseTimeout)
-                CompletableFuture.allOf(futuresArray).completeOnTimeout(null, timeOut, TimeUnit.SECONDS).join();
-            else
-                CompletableFuture.allOf(futuresArray).join();
-            futures.clear();
             if (attackersLeft.isEmpty()) {
                 return aiAggression;
             }
@@ -986,19 +982,18 @@ public class AiAttackController {
 
         // Lightmine Field: make sure the AI doesn't wipe out its own creatures
         if (lightmineField) {
-            doLightmineFieldAttackLogic(attackersLeft, numForcedAttackers.get(), playAggro);
+            doLightmineFieldAttackLogic(attackersLeft, numForcedAttackers, playAggro);
         }
         // Revenge of Ravens: make sure the AI doesn't kill itself and doesn't damage itself unnecessarily
-        if (!doRevengeOfRavensAttackLogic(defender, attackersLeft, numForcedAttackers.get(), attackMax)) {
+        if (!doRevengeOfRavensAttackLogic(defender, attackersLeft, numForcedAttackers, attackMax)) {
             return aiAggression;
         }
 
         if (bAssault && defender == defendingOpponent) { // in case we are forced to attack someone else
             if (LOG_AI_ATTACKS)
                 System.out.println("Assault");
-            List<Card> left = new ArrayList<>(attackersLeft);
-            CardLists.sortByPowerDesc(left);
-            for (Card attacker : left) {
+            CardLists.sortByPowerDesc(attackersLeft);
+            for (Card attacker : attackersLeft) {
                 // reached max, breakup
                 if (attackMax != -1 && combat.getAttackers().size() >= attackMax)
                     return aiAggression;
@@ -1180,8 +1175,8 @@ public class AiAttackController {
         while (!attritionalAttackers.isEmpty() && humanLife > 0 && attackRounds < 99) {
             // sum attacker damage
             int damageThisRound = 0;
-            for (Card attritionalAttacker : attritionalAttackers) {
-                damageThisRound += attritionalAttacker.getNetCombatDamage();
+            for (int y = 0; y < attritionalAttackers.size(); y++) {
+                damageThisRound += attritionalAttackers.get(y).getNetCombatDamage();
             }
             // remove from player life
             humanLife -= damageThisRound;
@@ -1192,8 +1187,10 @@ public class AiAttackController {
                     attritionalAttackers.remove(attritionalAttackers.size() - 1);
                 }
             }
-            attackRounds++;
-            doAttritionalAttack = humanLife <= 0;
+            attackRounds += 1;
+            if (humanLife <= 0) {
+                doAttritionalAttack = true;
+            }
         }
         // *********************
         // end attritional attack calculation
@@ -1250,7 +1247,7 @@ public class AiAttackController {
         if (ratioDiff > 0 && doAttritionalAttack) {
             aiAggression = 5; // attack at all costs
         } else if ((ratioDiff >= 1 && this.attackers.size() > 1 && (humanLifeToDamageRatio < 2 || outNumber > 0))
-                || (playAggro && MyRandom.percentTrue(chanceToAttackToTrade) && humanLifeToDamageRatio > 1)) {
+        		|| (playAggro && MyRandom.percentTrue(chanceToAttackToTrade) && humanLifeToDamageRatio > 1)) {
             aiAggression = 4; // attack expecting to trade or damage player.
         } else if (MyRandom.percentTrue(chanceToAttackToTrade) && humanLifeToDamageRatio > 1
                 && defendingOpponent != null
@@ -1260,7 +1257,7 @@ public class AiAttackController {
                 && (ComputerUtilMana.getAvailableManaEstimate(ai) > 0) || tradeIfTappedOut
                 && (ComputerUtilMana.getAvailableManaEstimate(defendingOpponent) == 0) || MyRandom.percentTrue(extraChanceIfOppHasMana)
                 && (!tradeIfLowerLifePressure || (ai.getLifeLostLastTurn() + ai.getLifeLostThisTurn() <
-                defendingOpponent.getLifeLostThisTurn() + defendingOpponent.getLifeLostThisTurn()))) {
+                        defendingOpponent.getLifeLostThisTurn() + defendingOpponent.getLifeLostThisTurn()))) {
             aiAggression = 4; // random (chance-based) attack expecting to trade or damage player.
         } else if (ratioDiff >= 0 && this.attackers.size() > 1) {
             aiAggression = 3; // attack expecting to make good trades or damage player.
@@ -1288,20 +1285,19 @@ public class AiAttackController {
         if ( LOG_AI_ATTACKS )
             System.out.println("Normal attack");
 
-        List<Card> left = new ArrayList<>(attackersLeft);
-        left = notNeededAsBlockers(combat.getAttackers(), left);
-        left = sortAttackers(left);
+        attackersLeft = notNeededAsBlockers(combat.getAttackers(), attackersLeft);
+        attackersLeft = sortAttackers(attackersLeft);
 
         if ( LOG_AI_ATTACKS )
-            System.out.println("attackersLeft = " + left);
+            System.out.println("attackersLeft = " + attackersLeft);
 
         FCollection<GameEntity> possibleDefenders = new FCollection<>(defendingOpponent);
         possibleDefenders.addAll(defendingOpponent.getPlaneswalkersInPlay());
 
-        while (!left.isEmpty()) {
+        while (!attackersLeft.isEmpty()) {
             CardCollection attackersAssigned = new CardCollection();
-            for (int i = 0; i < left.size(); i++) {
-                final Card attacker = left.get(i);
+            for (int i = 0; i < attackersLeft.size(); i++) {
+                final Card attacker = attackersLeft.get(i);
                 if (aiAggression < 5 && !attacker.hasFirstStrike() && !attacker.hasDoubleStrike()
                         && ComputerUtilCombat.getTotalFirstStrikeBlockPower(attacker, defendingOpponent)
                         >= ComputerUtilCombat.getDamageToKill(attacker, false)) {
@@ -1315,7 +1311,7 @@ public class AiAttackController {
                     attackersAssigned.add(attacker);
 
                     // check if attackers are enough to finish the attacked planeswalker
-                    if (i < left.size() - 1 && defender instanceof Card card) {
+                    if (i < attackersLeft.size() - 1 && defender instanceof Card) {
                         final int blockNum = this.blockers.size();
                         int attackNum = 0;
                         int damage = 0;
@@ -1329,19 +1325,19 @@ public class AiAttackController {
                             }
                         }
                         // if enough damage: switch to next planeswalker
-                        if (damage >= ComputerUtilCombat.getDamageToKill(card, true)) {
+                        if (damage >= ComputerUtilCombat.getDamageToKill((Card) defender, true)) {
                             break;
                         }
                     }
                 }
             }
 
-            left.removeAll(attackersAssigned);
+            attackersLeft.removeAll(attackersAssigned);
             possibleDefenders.remove(defender);
-            if (left.isEmpty() || possibleDefenders.isEmpty()) {
+            if (attackersLeft.isEmpty() || possibleDefenders.isEmpty()) {
                 break;
             }
-            CardCollection pwDefending = new CardCollection(IterableUtil.filter(possibleDefenders, Card.class));
+            CardCollection pwDefending = new CardCollection(Iterables.filter(possibleDefenders, Card.class));
             if (pwDefending.isEmpty()) {
                 // TODO for now only looks at same player as we'd have to check the others from start too
                 //defender = new PlayerCollection(Iterables.filter(possibleDefenders, Player.class)).min(PlayerPredicates.compareByLife());
@@ -1355,113 +1351,6 @@ public class AiAttackController {
         return aiAggression;
     }
 
-    private class SpellAbilityFactors {
-        Card attacker = null;
-        boolean canBeKilled = false; // indicates if the attacker can be killed
-        boolean canBeKilledByOne = false; // indicates if the attacker can be killed by a single blocker
-        boolean canKillAll = true; // indicates if the attacker can kill all single blockers
-        boolean canKillAllDangerous = true; // indicates if the attacker can kill all single blockers with wither or infect
-        boolean isWorthLessThanAllKillers = true;
-        boolean hasAttackEffect = false;
-        boolean hasCombatEffect = false;
-        boolean dangerousBlockersPresent = false;
-        boolean canTrampleOverDefenders = false;
-        int numberOfPossibleBlockers = 0;
-        int defPower = 0;
-
-        SpellAbilityFactors(Card c) {
-            attacker = c;
-        }
-
-        private boolean canBeBlocked() {
-            return numberOfPossibleBlockers > 2
-                    || (numberOfPossibleBlockers >= 1 && CombatUtil.canAttackerBeBlockedWithAmount(attacker, 1, defendingOpponent))
-                    || (numberOfPossibleBlockers == 2 && CombatUtil.canAttackerBeBlockedWithAmount(attacker, 2, defendingOpponent));
-        }
-
-        private void calculate(final List<Card> defenders, final Combat combat) {
-            hasAttackEffect = attacker.getSVar("HasAttackEffect").equals("TRUE") || attacker.hasKeyword(Keyword.ANNIHILATOR);
-            // is there a gain in attacking even when the blocker is not killed (Lifelink, Wither,...)
-            hasCombatEffect = attacker.getSVar("HasCombatEffect").equals("TRUE") || "Blocked".equals(attacker.getSVar("HasAttackEffect"))
-                    || attacker.isWitherDamage() || attacker.hasKeyword(Keyword.LIFELINK) || attacker.hasKeyword(Keyword.AFFLICT);
-
-            // contains only the defender's blockers that can actually block the attacker
-            CardCollection validBlockers = CardLists.filter(defenders, defender1 -> CombatUtil.canBlock(attacker, defender1));
-
-            canTrampleOverDefenders = attacker.hasKeyword(Keyword.TRAMPLE) && attacker.getNetCombatDamage() > Aggregates.sum(validBlockers, Card::getNetToughness);
-
-            // used to check that CanKillAllDangerous check makes sense in context where creatures with dangerous abilities are present
-            dangerousBlockersPresent = validBlockers.anyMatch(
-                    CardPredicates.hasKeyword(Keyword.LIFELINK)
-                    .or(Card::isWitherDamage)
-            );
-
-            // total power of the defending creatures, used in predicting whether a gang block can kill the attacker
-            defPower = CardLists.getTotalPower(validBlockers, null);
-
-            // look at the attacker in relation to the blockers to establish a
-            // number of factors about the attacking context that will be relevant
-            // to the attackers decision according to the selected strategy
-            for (final Card blocker : validBlockers) {
-                // if both isWorthLessThanAllKillers and canKillAllDangerous are false there's nothing more to check
-                if (isWorthLessThanAllKillers || canKillAllDangerous || numberOfPossibleBlockers < 2) {
-                    numberOfPossibleBlockers += 1;
-                    if (isWorthLessThanAllKillers && ComputerUtilCombat.canDestroyAttacker(ai, attacker, blocker, combat, false)
-                            && !(attacker.hasKeyword(Keyword.UNDYING) && attacker.getCounters(CounterEnumType.P1P1) == 0)) {
-                        canBeKilledByOne = true; // there is a single creature on the battlefield that can kill the creature
-                        // see if the defending creature is of higher or lower
-                        // value. We don't want to attack only to lose value
-                        if (isWorthLessThanAllKillers && !attacker.hasSVar("SacMe")
-                                && ComputerUtilCard.evaluateCreature(blocker) <= ComputerUtilCard.evaluateCreature(attacker)) {
-                            isWorthLessThanAllKillers = false;
-                        }
-                    }
-                    // see if this attacking creature can destroy this defender, if
-                    // not record that it can't kill everything
-                    if (canKillAllDangerous && !ComputerUtilCombat.canDestroyBlocker(ai, blocker, attacker, combat, false)) {
-                        canKillAll = false;
-
-                        if (blocker.getSVar("HasCombatEffect").equals("TRUE") || blocker.getSVar("HasBlockEffect").equals("TRUE")
-                                || blocker.isWitherDamage() || blocker.hasKeyword(Keyword.LIFELINK)) {
-                            canKillAllDangerous = false;
-                            // there is a creature that can survive an attack from this creature
-                            // and combat will have negative effects
-                        }
-
-                        // Check if maybe we are too reckless in adding this attacker
-                        if (canKillAllDangerous) {
-                            boolean avoidAttackingIntoBlock = ai.getController().isAI()
-                                    && ((PlayerControllerAi) ai.getController()).getAi().getBooleanProperty(AiProps.TRY_TO_AVOID_ATTACKING_INTO_CERTAIN_BLOCK);
-                            boolean attackerWillDie = defPower >= attacker.getNetToughness();
-                            boolean uselessAttack = !hasCombatEffect && !hasAttackEffect;
-                            boolean noContributionToAttack = attackers.size() <= defenders.size() || attacker.getNetPower() <= 0;
-
-                            // We are attacking too recklessly if we can't kill a single blocker and:
-                            // - our creature will die for sure (chump attack)
-                            // - our attack will not do anything special (no attack/combat effect to proc)
-                            // - we can't deal damage to our opponent with sheer number of attackers and/or our attacker's power is 0 or less
-                            if (attackerWillDie || (avoidAttackingIntoBlock && uselessAttack && noContributionToAttack)) {
-                                canKillAllDangerous = false;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // performance-wise it doesn't seem worth it to check attackVigilance() instead (only includes a single niche card)
-            if (!attacker.hasKeyword(Keyword.VIGILANCE) && ComputerUtilCard.canBeKilledByRoyalAssassin(ai, attacker)) {
-                canKillAllDangerous = false;
-                canBeKilled = true;
-                canBeKilledByOne = true;
-                isWorthLessThanAllKillers = false;
-                hasCombatEffect = false;
-            } else if ((canKillAllDangerous || !canBeKilled) && ComputerUtilCard.canBeBlockedProfitably(defendingOpponent, attacker, true)) {
-                canKillAllDangerous = false;
-                canBeKilled = true;
-            }
-        }
-    }
-
     /**
      * <p>
      * shouldAttack.
@@ -1476,6 +1365,14 @@ public class AiAttackController {
      * @return a boolean.
      */
     public final boolean shouldAttack(final Card attacker, final List<Card> defenders, final Combat combat, final GameEntity defender) {
+        boolean canBeKilled = false; // indicates if the attacker can be killed
+        boolean canBeKilledByOne = false; // indicates if the attacker can be killed by a single blocker
+        boolean canKillAll = true; // indicates if the attacker can kill all single blockers
+        boolean canKillAllDangerous = true; // indicates if the attacker can kill all single blockers with wither or infect
+        boolean isWorthLessThanAllKillers = true;
+        boolean canBeBlocked = false;
+        int numberOfPossibleBlockers = 0;
+
         // Is it a creature that has a more valuable ability with a tap cost than what it can do by attacking?
         if (attacker.hasSVar("NonCombatPriority") && !attacker.hasKeyword(Keyword.VIGILANCE)) {
             // For each level of priority, enemy has to have life as much as the creature's power
@@ -1486,7 +1383,7 @@ public class AiAttackController {
                 // Check if the card actually has an ability the AI can and wants to play, if not, attacking is fine!
                 for (SpellAbility sa : attacker.getSpellAbilities()) {
                     // Do not attack if we can afford using the ability.
-                    if (sa.isActivatedAbility() && sa.getPayCosts().hasTapCost()) {
+                    if (sa.isActivatedAbility()) {
                         if (ComputerUtilCost.canPayCost(sa, ai, false)) {
                             return false;
                         }
@@ -1500,72 +1397,161 @@ public class AiAttackController {
         if (!isEffectiveAttacker(ai, attacker, combat, defender)) {
             return false;
         }
+        boolean hasAttackEffect = attacker.getSVar("HasAttackEffect").equals("TRUE") || attacker.hasStartOfKeyword("Annihilator");
+        // is there a gain in attacking even when the blocker is not killed (Lifelink, Wither,...)
+        boolean hasCombatEffect = attacker.getSVar("HasCombatEffect").equals("TRUE") || "Blocked".equals(attacker.getSVar("HasAttackEffect"));
 
-        SpellAbilityFactors saf = new SpellAbilityFactors(attacker);
-        if (aiAggression != 5) {
-            saf.calculate(defenders, combat);
+        if (!hasCombatEffect) {
+            if (attacker.isWitherDamage() || attacker.hasKeyword(Keyword.LIFELINK) || attacker.hasKeyword(Keyword.AFFLICT)) {
+                hasCombatEffect = true;
+            }
+        }
+
+        // contains only the defender's blockers that can actually block the attacker
+        CardCollection validBlockers = CardLists.filter(defenders, new Predicate<Card>() {
+            @Override
+            public boolean apply(Card defender) {
+                return CombatUtil.canBlock(attacker, defender);
+            }
+        });
+
+        boolean canTrampleOverDefenders = attacker.hasKeyword(Keyword.TRAMPLE) && attacker.getNetCombatDamage() > Aggregates.sum(validBlockers, CardPredicates.Accessors.fnGetNetToughness);
+
+        // used to check that CanKillAllDangerous check makes sense in context where creatures with dangerous abilities are present
+        boolean dangerousBlockersPresent = Iterables.any(validBlockers, Predicates.or(
+                CardPredicates.hasKeyword(Keyword.WITHER), CardPredicates.hasKeyword(Keyword.INFECT),
+                CardPredicates.hasKeyword(Keyword.LIFELINK)));
+
+        // total power of the defending creatures, used in predicting whether a gang block can kill the attacker
+        int defPower = CardLists.getTotalPower(validBlockers, true, false);
+
+        // look at the attacker in relation to the blockers to establish a
+        // number of factors about the attacking context that will be relevant
+        // to the attackers decision according to the selected strategy
+        for (final Card blocker : validBlockers) {
+            // if both isWorthLessThanAllKillers and canKillAllDangerous are false there's nothing more to check
+            if (isWorthLessThanAllKillers || canKillAllDangerous || numberOfPossibleBlockers < 2) {
+                numberOfPossibleBlockers += 1;
+                if (isWorthLessThanAllKillers && ComputerUtilCombat.canDestroyAttacker(ai, attacker, blocker, combat, false)
+                        && !(attacker.hasKeyword(Keyword.UNDYING) && attacker.getCounters(CounterEnumType.P1P1) == 0)) {
+                    canBeKilledByOne = true; // there is a single creature on the battlefield that can kill the creature
+                    // see if the defending creature is of higher or lower
+                    // value. We don't want to attack only to lose value
+                    if (isWorthLessThanAllKillers && !attacker.hasSVar("SacMe")
+                            && ComputerUtilCard.evaluateCreature(blocker) <= ComputerUtilCard.evaluateCreature(attacker)) {
+                        isWorthLessThanAllKillers = false;
+                    }
+                }
+                // see if this attacking creature can destroy this defender, if
+                // not record that it can't kill everything
+                if (canKillAllDangerous && !ComputerUtilCombat.canDestroyBlocker(ai, blocker, attacker, combat, false)) {
+                    canKillAll = false;
+                    if (blocker.getSVar("HasCombatEffect").equals("TRUE") || blocker.getSVar("HasBlockEffect").equals("TRUE")) {
+                        canKillAllDangerous = false;
+                    } else {
+                        if (blocker.hasKeyword(Keyword.WITHER) || blocker.hasKeyword(Keyword.INFECT)
+                                || blocker.hasKeyword(Keyword.LIFELINK)) {
+                            canKillAllDangerous = false;
+                            // there is a creature that can survive an attack from this creature
+                            // and combat will have negative effects
+                        }
+
+                        // Check if maybe we are too reckless in adding this attacker
+                        if (canKillAllDangerous) {
+                            boolean avoidAttackingIntoBlock = ai.getController().isAI()
+                                    && ((PlayerControllerAi) ai.getController()).getAi().getBooleanProperty(AiProps.TRY_TO_AVOID_ATTACKING_INTO_CERTAIN_BLOCK);
+                            boolean attackerWillDie = defPower >= attacker.getNetToughness();
+                            boolean uselessAttack = !hasCombatEffect && !hasAttackEffect;
+                            boolean noContributionToAttack = this.attackers.size() <= defenders.size() || attacker.getNetPower() <= 0;
+
+                            // We are attacking too recklessly if we can't kill a single blocker and:
+                            // - our creature will die for sure (chump attack)
+                            // - our attack will not do anything special (no attack/combat effect to proc)
+                            // - we can't deal damage to our opponent with sheer number of attackers and/or our attacker's power is 0 or less
+                            if (attackerWillDie || (avoidAttackingIntoBlock && uselessAttack && noContributionToAttack)) {
+                                canKillAllDangerous = false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!attacker.hasKeyword(Keyword.VIGILANCE) && ComputerUtilCard.canBeKilledByRoyalAssassin(ai, attacker)) {
+            canKillAllDangerous = false;
+            canBeKilled = true;
+            canBeKilledByOne = true;
+            isWorthLessThanAllKillers = false;
+            hasCombatEffect = false;
+        } else if ((canKillAllDangerous || !canBeKilled) && ComputerUtilCard.canBeBlockedProfitably(defendingOpponent, attacker, true)) {
+            canKillAllDangerous = false;
+            canBeKilled = true;
         }
 
         // if the creature cannot block and can kill all opponents they might as
         // well attack, they do nothing staying back
-        if (saf.canKillAll && saf.isWorthLessThanAllKillers && !CombatUtil.canBlock(attacker)) {
+        if (canKillAll && isWorthLessThanAllKillers && !CombatUtil.canBlock(attacker)) {
             if (LOG_AI_ATTACKS)
                 System.out.println(attacker.getName() + " = attacking because they can't block, expecting to kill or damage player");
             return true;
-        }
-        if (!saf.canBeKilled && !saf.dangerousBlockersPresent && saf.canTrampleOverDefenders) {
+        } else if (!canBeKilled && !dangerousBlockersPresent && canTrampleOverDefenders) {
             if (LOG_AI_ATTACKS)
                 System.out.println(attacker.getName() + " = expecting to survive and get some Trample damage through");
             return true;
         }
 
+        if (numberOfPossibleBlockers > 2
+                || (numberOfPossibleBlockers >= 1 && CombatUtil.canAttackerBeBlockedWithAmount(attacker, 1, defendingOpponent))
+                || (numberOfPossibleBlockers == 2 && CombatUtil.canAttackerBeBlockedWithAmount(attacker, 2, defendingOpponent))) {
+            canBeBlocked = true;
+        }
         // decide if the creature should attack based on the prevailing strategy choice in aiAggression
         switch (aiAggression) {
-            case 6: // Exalted: expecting to at least kill a creature of equal value or not be blocked
-                if ((saf.canKillAll && saf.isWorthLessThanAllKillers) || !saf.canBeBlocked()) {
-                    if (LOG_AI_ATTACKS)
-                        System.out.println(attacker.getName() + " = attacking expecting to kill creature, or is unblockable");
-                    return true;
-                }
-                break;
-            case 5: // all out attacking
+        case 6: // Exalted: expecting to at least kill a creature of equal value or not be blocked
+            if ((canKillAll && isWorthLessThanAllKillers) || !canBeBlocked) {
                 if (LOG_AI_ATTACKS)
-                    System.out.println(attacker.getName() + " = all out attacking");
+                    System.out.println(attacker.getName() + " = attacking expecting to kill creature, or is unblockable");
                 return true;
-            case 4: // expecting to at least trade with something, or can attack "for free", expecting no counterattack
-                if (saf.canKillAll || (saf.dangerousBlockersPresent && saf.canKillAllDangerous && !saf.canBeKilledByOne) || !saf.canBeBlocked()
-                        || saf.defPower == 0) {
-                    if (LOG_AI_ATTACKS)
-                        System.out.println(attacker.getName() + " = attacking expecting to at least trade with something");
-                    return true;
-                }
-                break;
-            case 3: // expecting to at least kill a creature of equal value or not be blocked
-                if ((saf.canKillAll && saf.isWorthLessThanAllKillers)
-                        || (((saf.dangerousBlockersPresent && saf.canKillAllDangerous) || saf.hasAttackEffect || saf.hasCombatEffect) && !saf.canBeKilledByOne)
-                        || !saf.canBeBlocked()) {
-                    if (LOG_AI_ATTACKS)
-                        System.out.println(attacker.getName() + " = attacking expecting to kill creature or cause damage, or is unblockable");
-                    return true;
-                }
-                break;
-            case 2: // attack expecting to attract a group block or destroying a single blocker and surviving
-                if (!saf.canBeBlocked() || ((saf.canKillAll || saf.hasAttackEffect || saf.hasCombatEffect) && !saf.canBeKilledByOne &&
-                        ((saf.dangerousBlockersPresent && saf.canKillAllDangerous) || !saf.canBeKilled))) {
-                    if (LOG_AI_ATTACKS)
-                        System.out.println(attacker.getName() + " = attacking expecting to survive or attract group block");
-                    return true;
-                }
-                break;
-            case 1: // unblockable creatures only
-                if (!saf.canBeBlocked() || (saf.numberOfPossibleBlockers == 1 && saf.canKillAll && !saf.canBeKilledByOne)) {
-                    if (LOG_AI_ATTACKS)
-                        System.out.println(attacker.getName() + " = attacking expecting not to be blocked");
-                    return true;
-                }
-                break;
-            default:
-                break;
+            }
+            break;
+        case 5: // all out attacking
+            if (LOG_AI_ATTACKS)
+                System.out.println(attacker.getName() + " = all out attacking");
+            return true;
+        case 4: // expecting to at least trade with something, or can attack "for free", expecting no counterattack
+            if (canKillAll || (dangerousBlockersPresent && canKillAllDangerous && !canBeKilledByOne) || !canBeBlocked
+                    || (defPower == 0 && !ComputerUtilCombat.lifeInDanger(ai, combat))) {
+                if (LOG_AI_ATTACKS)
+                    System.out.println(attacker.getName() + " = attacking expecting to at least trade with something");
+                return true;
+            }
+            break;
+        case 3: // expecting to at least kill a creature of equal value or not be blocked
+            if ((canKillAll && isWorthLessThanAllKillers)
+                    || (((dangerousBlockersPresent && canKillAllDangerous) || hasAttackEffect || hasCombatEffect) && !canBeKilledByOne)
+                    || !canBeBlocked) {
+                if (LOG_AI_ATTACKS)
+                    System.out.println(attacker.getName() + " = attacking expecting to kill creature or cause damage, or is unblockable");
+                return true;
+            }
+            break;
+        case 2: // attack expecting to attract a group block or destroying a single blocker and surviving
+            if (!canBeBlocked || ((canKillAll || hasAttackEffect || hasCombatEffect) && !canBeKilledByOne &&
+                    ((dangerousBlockersPresent && canKillAllDangerous) || !canBeKilled))) {
+                if (LOG_AI_ATTACKS)
+                    System.out.println(attacker.getName() + " = attacking expecting to survive or attract group block");
+                return true;
+            }
+            break;
+        case 1: // unblockable creatures only
+            if (!canBeBlocked || (numberOfPossibleBlockers == 1 && canKillAll && !canBeKilledByOne)) {
+                if (LOG_AI_ATTACKS)
+                    System.out.println(attacker.getName() + " = attacking expecting not to be blocked");
+                return true;
+            }
+            break;
+        default:
+            break;
         }
         return false; // don't attack
     }
@@ -1588,7 +1574,7 @@ public class AiAttackController {
             // but there are no creatures it can target, no need to exert with it
             boolean missTarget = false;
             for (StaticAbility st : c.getStaticAbilities()) {
-                if (!st.checkMode(StaticAbilityMode.OptionalAttackCost)) {
+                if (!"OptionalAttackCost".equals(st.getParam("Mode"))) {
                     continue;
                 }
                 SpellAbility sa = st.getPayingTrigSA();
@@ -1610,12 +1596,12 @@ public class AiAttackController {
                     break;
                 }
                 if (sa.usesTargeting()) {
-                    sa.setActivatingPlayer(c.getController());
+                    sa.setActivatingPlayer(c.getController(), true);
                     List<Card> validTargets = CardUtil.getValidCardsToTarget(sa);
                     if (validTargets.isEmpty()) {
                         missTarget = true;
                         break;
-                    } else if (sa.isCurse() && validTargets.stream().noneMatch(
+                    } else if (sa.isCurse() && !Iterables.any(validTargets,
                             CardPredicates.isControlledByAnyOf(c.getController().getOpponents()))) {
                         // e.g. Ahn-Crop Crasher - the effect is only good when aimed at opponent's creatures
                         missTarget = true;
@@ -1682,31 +1668,31 @@ public class AiAttackController {
             }
             if (color != null) {
                 switch (color) {
-                    case "black":
-                        if (!c.isBlack()) {
-                            color = null;
-                        }
-                        break;
-                    case "blue":
-                        if (!c.isBlue()) {
-                            color = null;
-                        }
-                        break;
-                    case "green":
-                        if (!c.isGreen()) {
-                            color = null;
-                        }
-                        break;
-                    case "red":
-                        if (!c.isRed()) {
-                            color = null;
-                        }
-                        break;
-                    case "white":
-                        if (!c.isWhite()) {
-                            color = null;
-                        }
-                        break;
+                case "black":
+                    if (!c.isBlack()) {
+                        color = null;
+                    }
+                    break;
+                case "blue":
+                    if (!c.isBlue()) {
+                        color = null;
+                    }
+                    break;
+                case "green":
+                    if (!c.isGreen()) {
+                        color = null;
+                    }
+                    break;
+                case "red":
+                    if (!c.isRed()) {
+                        color = null;
+                    }
+                    break;
+                case "white":
+                    if (!c.isWhite()) {
+                        color = null;
+                    }
+                    break;
                 }
             }
             if (color == null && artifact == null) { //nothing can make the attacker unblockable
@@ -1722,7 +1708,7 @@ public class AiAttackController {
         return null; //should never get here
     }
 
-    private void doLightmineFieldAttackLogic(final Queue<Card> attackersLeft, int numForcedAttackers, boolean playAggro) {
+    private void doLightmineFieldAttackLogic(final List<Card> attackersLeft, int numForcedAttackers, boolean playAggro) {
         CardCollection attSorted = new CardCollection(attackersLeft);
         CardCollection attUnsafe = new CardCollection();
         CardLists.sortByToughnessDesc(attSorted);
@@ -1752,15 +1738,13 @@ public class AiAttackController {
         attackersLeft.removeAll(attUnsafe);
     }
 
-    private boolean doRevengeOfRavensAttackLogic(final GameEntity defender, final Queue<Card> attackersLeft, int numForcedAttackers, int maxAttack) {
+    private boolean doRevengeOfRavensAttackLogic(final GameEntity defender, final List<Card> attackersLeft, int numForcedAttackers, int maxAttack) {
         // TODO: detect Revenge of Ravens by the trigger instead of by name
         boolean revengeOfRavens = false;
-        if (defender instanceof Player player) {
-            revengeOfRavens = !CardLists.filter(player.getCardsIn(ZoneType.Battlefield),
-                    CardPredicates.nameEquals("Revenge of Ravens")).isEmpty();
-        } else if (defender instanceof Card card) {
-            revengeOfRavens = !CardLists.filter(card.getController().getCardsIn(ZoneType.Battlefield),
-                    CardPredicates.nameEquals("Revenge of Ravens")).isEmpty();
+        if (defender instanceof Player) {
+            revengeOfRavens = !CardLists.filter(((Player)defender).getCardsIn(ZoneType.Battlefield), CardPredicates.nameEquals("Revenge of Ravens")).isEmpty();
+        } else if (defender instanceof Card) {
+            revengeOfRavens = !CardLists.filter(((Card)defender).getController().getCardsIn(ZoneType.Battlefield), CardPredicates.nameEquals("Revenge of Ravens")).isEmpty();
         }
 
         if (!revengeOfRavens) {

forge-ai/src/main/java/forge/ai/AiBlockController.java

@@ -18,7 +18,9 @@
 package forge.ai;
 
 import java.util.*;
-import java.util.function.Predicate;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 
 import forge.card.CardStateName;
 import forge.game.GameEntity;
@@ -138,20 +140,23 @@ public class AiBlockController {
             ComputerUtilCard.sortByEvaluateCreature(attackers);
             CardLists.sortByPowerDesc(attackers);
             //move cards like Phage the Untouchable to the front
-            attackers.sort((o1, o2) -> {
-                if (o1.hasSVar("MustBeBlocked") && !o2.hasSVar("MustBeBlocked")) {
-                    return -1;
+            Collections.sort(attackers, new Comparator<Card>() {
+                @Override
+                public int compare(final Card o1, final Card o2) {
+                    if (o1.hasSVar("MustBeBlocked") && !o2.hasSVar("MustBeBlocked")) {
+                        return -1;
+                    }
+                    if (!o1.hasSVar("MustBeBlocked") && o2.hasSVar("MustBeBlocked")) {
+                        return 1;
+                    }
+                    if (attackingCmd.contains(o1) && !attackingCmd.contains(o2)) {
+                        return -1;
+                    }
+                    if (!attackingCmd.contains(o1) && attackingCmd.contains(o2)) {
+                        return 1;
+                    }
+                    return 0;
                 }
-                if (!o1.hasSVar("MustBeBlocked") && o2.hasSVar("MustBeBlocked")) {
-                    return 1;
-                }
-                if (attackingCmd.contains(o1) && !attackingCmd.contains(o2)) {
-                    return -1;
-                }
-                if (!attackingCmd.contains(o1) && attackingCmd.contains(o2)) {
-                    return 1;
-                }
-                return 0;
             });
             return attackers;
         }
@@ -161,12 +166,12 @@ public class AiBlockController {
         // defend battles with fewer defense counters before battles with more defense counters,
         // if planeswalker/battle will be too difficult to defend don't even bother
         for (GameEntity defender : defenders) {
-            if ((defender instanceof Card card1 && card1.getController().equals(ai))
-                    || (defender instanceof Card card2 && card2.isBattle() && card2.getProtectingPlayer().equals(ai))) {
-                final CardCollection ccAttackers = combat.getAttackersOf(defender);
+            if ((defender instanceof Card && ((Card) defender).getController().equals(ai))
+                    || (defender instanceof Card && ((Card) defender).isBattle() && ((Card) defender).getProtectingPlayer().equals(ai))) {
+                final CardCollection attackers = combat.getAttackersOf(defender);
                 // Begin with the attackers that pose the biggest threat
-                CardLists.sortByPowerDesc(ccAttackers);
-                sortedAttackers.addAll(ccAttackers);
+                CardLists.sortByPowerDesc(attackers);
+                sortedAttackers.addAll(attackers);
             } else if (defender instanceof Player && defender.equals(ai)) {
                 firstAttacker = combat.getAttackersOf(defender);
                 CardLists.sortByPowerDesc(firstAttacker);
@@ -247,10 +252,8 @@ public class AiBlockController {
                     }
                 }
                 // 4.Blockers that have a big upside when dying
-                // 4a.Blockers that are profitable to sacrifice even in the event of an unfavorable block
                 for (Card b : blockers) {
-                    if ((b.hasSVar("SacMe") && Integer.parseInt(b.getSVar("SacMe")) > 3) ||
-                            (b.hasSVar("SacMeAfterBlock") && !attacker.hasKeyword(Keyword.TRAMPLE) && !attacker.hasKeyword(Keyword.BANDING))) {
+                    if (b.hasSVar("SacMe") && Integer.parseInt(b.getSVar("SacMe")) > 3) {
                         blocker = b;
                         if (!ComputerUtilCombat.canDestroyAttacker(ai, attacker, blocker, combat, false)) {
                             blockedButUnkilled.add(attacker);
@@ -265,6 +268,7 @@ public class AiBlockController {
 
                     // check for triggers when unblocked
                     for (Trigger trigger : attacker.getTriggers()) {
+                        final Map<String, String> trigParams = trigger.getMapParams();
                         TriggerType mode = trigger.getMode();
 
                         if (!trigger.requirementsCheck(attacker.getGame())) {
@@ -278,7 +282,7 @@ public class AiBlockController {
                                 value += 50;
                             }
                         } else if (mode == TriggerType.AttackerUnblocked) {
-                            if (trigger.matchesValidParam("ValidCard", attacker)) {
+                            if (trigger.matchesValid(attacker, trigParams.get("ValidCard").split(","))) {
                                 value += 50;
                             }
                         }
@@ -325,35 +329,43 @@ public class AiBlockController {
     }
 
     private Predicate<Card> rampagesOrNeedsManyToBlock(final Combat combat) {
-        return CardPredicates.hasKeyword(Keyword.RAMPAGE).or(input -> {
-            // select creature that has a max blocker
-            return StaticAbilityCantAttackBlock.getMinMaxBlocker(input, combat.getDefenderPlayerByAttacker(input)).getRight() < Integer.MAX_VALUE;
+        return Predicates.or(CardPredicates.hasKeyword(Keyword.RAMPAGE), new Predicate<Card>() {
+
+            @Override
+            public boolean apply(Card input) {
+                // select creature that has a max blocker
+                return StaticAbilityCantAttackBlock.getMinMaxBlocker(input, combat.getDefenderPlayerByAttacker(input)).getRight() < Integer.MAX_VALUE;
+            }
+
         });
     }
 
     private Predicate<Card> changesPTWhenBlocked(final boolean onlyForDefVsTrample) {
-        return card -> {
-            for (final Trigger tr : card.getTriggers()) {
-                if (tr.getMode() == TriggerType.AttackerBlocked) {
-                    SpellAbility ab = tr.getOverridingAbility();
-                    if (ab != null) {
-                        if (ab.getApi() == ApiType.Pump && "Self".equals(ab.getParam("Defined"))) {
-                            String rawP = ab.getParam("NumAtt");
-                            String rawT = ab.getParam("NumDef");
-                            if ("+X".equals(rawP) && "+X".equals(rawT) && card.getSVar("X").startsWith("Count$Valid Creature.blockingTriggeredAttacker")) {
-                                return true;
+        return new Predicate<Card>() {
+            @Override
+            public boolean apply(Card card) {
+                for (final Trigger tr : card.getTriggers()) {
+                    if (tr.getMode() == TriggerType.AttackerBlocked) {
+                        SpellAbility ab = tr.getOverridingAbility();
+                        if (ab != null) {
+                            if (ab.getApi() == ApiType.Pump && "Self".equals(ab.getParam("Defined"))) {
+                                String rawP = ab.getParam("NumAtt");
+                                String rawT = ab.getParam("NumDef");
+                                if ("+X".equals(rawP) && "+X".equals(rawT) && card.getSVar("X").startsWith("Count$Valid Creature.blockingTriggeredAttacker")) {
+                                    return true;
+                                }
+                                // TODO: maybe also predict calculated bonus above certain threshold?
+                            } else if (ab.getApi() == ApiType.PumpAll && ab.hasParam("ValidCards")
+                                && ab.getParam("ValidCards").startsWith("Creature.blockingSource")) {
+                                int pBonus = AbilityUtils.calculateAmount(card, ab.getParam("NumAtt"), ab);
+                                int tBonus = AbilityUtils.calculateAmount(card, ab.getParam("NumDef"), ab);
+                                return (!onlyForDefVsTrample && pBonus < 0) || tBonus < 0;
                             }
-                            // TODO: maybe also predict calculated bonus above certain threshold?
-                        } else if (ab.getApi() == ApiType.PumpAll && ab.hasParam("ValidCards")
-                            && ab.getParam("ValidCards").startsWith("Creature.blockingSource")) {
-                            int pBonus = AbilityUtils.calculateAmount(card, ab.getParam("NumAtt"), ab);
-                            int tBonus = AbilityUtils.calculateAmount(card, ab.getParam("NumDef"), ab);
-                            return (!onlyForDefVsTrample && pBonus < 0) || tBonus < 0;
                         }
                     }
                 }
+                return false;
             }
-            return false;
         };
     }
 
@@ -366,7 +378,7 @@ public class AiBlockController {
      * @param combat a {@link forge.game.combat.Combat} object.
      */
     private void makeGangBlocks(final Combat combat) {
-        List<Card> currentAttackers = CardLists.filter(attackersLeft, rampagesOrNeedsManyToBlock(combat).negate());
+        List<Card> currentAttackers = CardLists.filter(attackersLeft, Predicates.not(rampagesOrNeedsManyToBlock(combat)));
         List<Card> blockers;
 
         // Try to block an attacker without first strike with a gang of first strikers
@@ -439,12 +451,15 @@ public class AiBlockController {
 
             // Try to add blockers that could be destroyed, but are worth less than the attacker
             // Don't use blockers without First Strike or Double Strike if attacker has it
-            usableBlockers = CardLists.filter(blockers, c -> {
-                if (ComputerUtilCombat.dealsFirstStrikeDamage(attacker, false, combat)
-                        && !ComputerUtilCombat.dealsFirstStrikeDamage(c, false, combat)) {
-                    return false;
+            usableBlockers = CardLists.filter(blockers, new Predicate<Card>() {
+                @Override
+                public boolean apply(final Card c) {
+                    if (ComputerUtilCombat.dealsFirstStrikeDamage(attacker, false, combat)
+                            && !ComputerUtilCombat.dealsFirstStrikeDamage(c, false, combat)) {
+                        return false;
+                    }
+                    return lifeInDanger || wouldLikeToRandomlyTrade(attacker, c, combat) || ComputerUtilCard.evaluateCreature(c) + diff < ComputerUtilCard.evaluateCreature(attacker);
                 }
-                return lifeInDanger || wouldLikeToRandomlyTrade(attacker, c, combat) || ComputerUtilCard.evaluateCreature(c) + diff < ComputerUtilCard.evaluateCreature(attacker);
             });
             if (usableBlockers.size() < 2) {
                 return;
@@ -563,8 +578,13 @@ public class AiBlockController {
             final List<Card> blockGang = new ArrayList<>();
             int absorbedDamage; // The amount of damage needed to kill the first blocker
 
-            List<Card> usableBlockers = CardLists.filter(blockers, c -> c.getNetToughness() > attacker.getNetCombatDamage() // performance shortcut
-                    || c.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfBlocker(attacker, c, true) > attacker.getNetCombatDamage());
+            List<Card> usableBlockers = CardLists.filter(blockers, new Predicate<Card>() {
+                @Override
+                public boolean apply(final Card c) {
+                    return c.getNetToughness() > attacker.getNetCombatDamage() // performance shortcut
+                            || c.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfBlocker(attacker, c, true) > attacker.getNetCombatDamage();
+                }
+            });
             if (usableBlockers.size() < 2) {
                 return;
             }
@@ -738,11 +758,11 @@ public class AiBlockController {
         List<Card> chumpBlockers;
 
         List<Card> tramplingAttackers = CardLists.getKeyword(attackers, Keyword.TRAMPLE);
-        tramplingAttackers = CardLists.filter(tramplingAttackers, rampagesOrNeedsManyToBlock(combat).negate());
+        tramplingAttackers = CardLists.filter(tramplingAttackers, Predicates.not(rampagesOrNeedsManyToBlock(combat)));
 
         // TODO - Instead of filtering out rampage-like and similar triggers, make the AI properly count P/T and
         // reinforce when actually possible without losing material.
-        tramplingAttackers = CardLists.filter(tramplingAttackers, changesPTWhenBlocked(true).negate());
+        tramplingAttackers = CardLists.filter(tramplingAttackers, Predicates.not(changesPTWhenBlocked(true)));
 
         for (final Card attacker : tramplingAttackers) {
             if (CombatUtil.getMinNumBlockersForAttacker(attacker, combat.getDefenderPlayerByAttacker(attacker)) > combat.getBlockers(attacker).size()) {
@@ -751,6 +771,10 @@ public class AiBlockController {
 
             boolean needsMoreChumpBlockers = true;
 
+            // See if it's possible to tank up the damage with Banding
+            List<String> bandsWithString = Arrays.asList("Bands with Other Legendary Creatures",
+                    "Bands with Other Creatures named Wolves of the Hunt",
+                    "Bands with Other Dinosaurs");
             if (AttackingBand.isValidBand(combat.getBlockers(attacker), true)) {
                 continue;
             }
@@ -760,7 +784,7 @@ public class AiBlockController {
 
             // See if there's a Banding blocker that can tank the damage
             for (final Card blocker : chumpBlockers) {
-                if (blocker.hasKeyword(Keyword.BANDING) || blocker.hasKeyword(Keyword.BANDSWITH)) {
+                if (blocker.hasKeyword(Keyword.BANDING) || blocker.hasAnyKeyword(bandsWithString)) {
                     if (ComputerUtilCombat.getAttack(attacker) > ComputerUtilCombat.totalShieldDamage(attacker, combat.getBlockers(attacker))
                             && ComputerUtilCombat.shieldDamage(attacker, blocker) > 0
                             && CombatUtil.canBlock(attacker, blocker, combat) && ComputerUtilCombat.lifeInDanger(ai, combat)) {
@@ -793,18 +817,23 @@ public class AiBlockController {
     private void reinforceBlockersToKill(final Combat combat) {
         List<Card> safeBlockers;
         List<Card> blockers;
-        List<Card> targetAttackers = CardLists.filter(blockedButUnkilled, rampagesOrNeedsManyToBlock(combat).negate());
+        List<Card> targetAttackers = CardLists.filter(blockedButUnkilled, Predicates.not(rampagesOrNeedsManyToBlock(combat)));
 
         // TODO - Instead of filtering out rampage-like and similar triggers, make the AI properly count P/T and
         // reinforce when actually possible without losing material.
-        targetAttackers = CardLists.filter(targetAttackers, changesPTWhenBlocked(false).negate());
+        targetAttackers = CardLists.filter(targetAttackers, Predicates.not(changesPTWhenBlocked(false)));
 
         for (final Card attacker : targetAttackers) {
             blockers = getPossibleBlockers(combat, attacker, blockersLeft, false);
             blockers.removeAll(combat.getBlockers(attacker));
 
             // Don't add any blockers that won't kill the attacker because the damage would be prevented by a static effect
-            blockers = CardLists.filter(blockers, blocker -> !ComputerUtilCombat.isCombatDamagePrevented(blocker, attacker, blocker.getNetCombatDamage()));
+            blockers = CardLists.filter(blockers, new Predicate<Card>() {
+                @Override
+                public boolean apply(Card blocker) {
+                    return !ComputerUtilCombat.isCombatDamagePrevented(blocker, attacker, blocker.getNetCombatDamage());
+                }
+            });
 
             // Try to use safe blockers first
             if (blockers.size() > 0) {
@@ -872,9 +901,9 @@ public class AiBlockController {
             CardCollection threatenedPWs = new CardCollection();
             for (final Card attacker : attackers) {
                 GameEntity def = combat.getDefenderByAttacker(attacker);
-                if (def instanceof Card card) {
+                if (def instanceof Card) {
                     if (!onlyIfLethal) {
-                        threatenedPWs.add(card);
+                        threatenedPWs.add((Card) def);
                     } else {
                         int damageToPW = 0;
                         for (final Card pwatkr : combat.getAttackersOf(def)) {
@@ -891,9 +920,13 @@ public class AiBlockController {
 
             CardCollection pwsWithChumpBlocks = new CardCollection();
             CardCollection chosenChumpBlockers = new CardCollection();
-            CardCollection chumpPWDefenders = CardLists.filter(this.blockersLeft,
-                    card -> ComputerUtilCard.evaluateCreature(card) <= (card.isToken() ? evalThresholdToken : evalThresholdNonToken)
-            );
+            CardCollection chumpPWDefenders = CardLists.filter(this.blockersLeft, new Predicate<Card>() {
+                @Override
+                public boolean apply(Card card) {
+                    return ComputerUtilCard.evaluateCreature(card) <= (card.isToken() ? evalThresholdToken
+                            : evalThresholdNonToken);
+                }
+            });
             CardLists.sortByPowerAsc(chumpPWDefenders);
             if (!chumpPWDefenders.isEmpty()) {
                 for (final Card attacker : attackers) {
@@ -906,12 +939,12 @@ public class AiBlockController {
                         continue;
                     }
                     GameEntity def = combat.getDefenderByAttacker(attacker);
-                    if (def instanceof Card card && threatenedPWs.contains(def)) {
+                    if (def instanceof Card && threatenedPWs.contains(def)) {
                         Card blockerDecided = null;
                         for (final Card blocker : chumpPWDefenders) {
                             if (CombatUtil.canBlock(attacker, blocker, combat)) {
                                 combat.addBlocker(attacker, blocker);
-                                pwsWithChumpBlocks.add(card);
+                                pwsWithChumpBlocks.add((Card) def);
                                 chosenChumpBlockers.add(blocker);
                                 blockerDecided = blocker;
                                 blockersLeft.remove(blocker);
@@ -1322,8 +1355,8 @@ public class AiBlockController {
         }
 
         int evalAtk = ComputerUtilCard.evaluateCreature(attacker, true, false);
-        boolean atkEmbalm = (attacker.hasKeyword(Keyword.EMBALM) || attacker.hasKeyword(Keyword.ETERNALIZE)) && !attacker.isToken();
-        boolean blkEmbalm = (blocker.hasKeyword(Keyword.EMBALM) || blocker.hasKeyword(Keyword.ETERNALIZE)) && !blocker.isToken();
+        boolean atkEmbalm = (attacker.hasStartOfKeyword("Embalm") || attacker.hasStartOfKeyword("Eternalize")) && !attacker.isToken();
+        boolean blkEmbalm = (blocker.hasStartOfKeyword("Embalm") || blocker.hasStartOfKeyword("Eternalize")) && !blocker.isToken();
 
         if (atkEmbalm && !blkEmbalm) {
             // The opponent will eventually get his creature back, while the AI won't
@@ -1343,11 +1376,11 @@ public class AiBlockController {
         boolean creatureParityOrAllowedDiff = aiCreatureCount
                 + (randomTradeIfBehindOnBoard ? maxCreatDiff : 0) >= oppCreatureCount;
         boolean wantToTradeWithCreatInHand = !checkingOther && randomTradeIfCreatInHand
-                && ai.getZone(ZoneType.Hand).contains(CardPredicates.CREATURES)
+                && ai.getZone(ZoneType.Hand).contains(CardPredicates.Presets.CREATURES)
                 && aiCreatureCount + maxCreatDiffWithRepl >= oppCreatureCount;
         boolean wantToSavePlaneswalker = MyRandom.percentTrue(chanceToSavePW)
-                && combat.getDefenderByAttacker(attacker) instanceof Card card
-                && card.isPlaneswalker();
+                && combat.getDefenderByAttacker(attacker) instanceof Card
+                && ((Card) combat.getDefenderByAttacker(attacker)).isPlaneswalker();
         boolean wantToTradeDownToSavePW = chanceToTradeDownToSaveWalker > 0;
 
         return ((evalBlk <= evalAtk + 1) || (wantToSavePlaneswalker && wantToTradeDownToSavePW)) // "1" accounts for tapped.

forge-ai/src/main/java/forge/ai/AiCardMemory.java

@@ -18,17 +18,13 @@
 
 package forge.ai;
 
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import forge.game.card.Card;
 import forge.game.player.Player;
 
-
 /**
  * <p>
  * AiCardMemory class.
@@ -67,13 +63,75 @@ public class AiCardMemory {
         REVEALED_CARDS // These cards were recently revealed to the AI by a call to PlayerControllerAi.reveal
     }
 
-    private final Supplier<Map<MemorySet, Set<Card>>> memoryMap = Suppliers.memoize(Maps::newConcurrentMap);
+    private final Set<Card> memMandatoryAttackers;
+    private final Set<Card> memTrickAttackers;
+    private final Set<Card> memHeldManaSources;
+    private final Set<Card> memHeldManaSourcesForCombat;
+    private final Set<Card> memHeldManaSourcesForEnemyCombat;
+    private final Set<Card> memHeldManaSourcesForNextSpell;
+    private final Set<Card> memAttachedThisTurn;
+    private final Set<Card> memAnimatedThisTurn;
+    private final Set<Card> memBouncedThisTurn;
+    private final Set<Card> memActivatedThisTurn;
+    private final Set<Card> memChosenFogEffect;
+    private final Set<Card> memMarkedToAvoidReentry;
+    private final Set<Card> memPaysTapCost;
+    private final Set<Card> memPaysSacCost;
+    private final Set<Card> memRevealedCards;
 
     public AiCardMemory() {
+        this.memMandatoryAttackers = new HashSet<>();
+        this.memHeldManaSources = new HashSet<>();
+        this.memHeldManaSourcesForCombat = new HashSet<>();
+        this.memHeldManaSourcesForEnemyCombat = new HashSet<>();
+        this.memAttachedThisTurn = new HashSet<>();
+        this.memAnimatedThisTurn = new HashSet<>();
+        this.memBouncedThisTurn = new HashSet<>();
+        this.memActivatedThisTurn = new HashSet<>();
+        this.memTrickAttackers = new HashSet<>();
+        this.memChosenFogEffect = new HashSet<>();
+        this.memMarkedToAvoidReentry = new HashSet<>();
+        this.memHeldManaSourcesForNextSpell = new HashSet<>();
+        this.memPaysTapCost = new HashSet<>();
+        this.memPaysSacCost = new HashSet<>();
+        this.memRevealedCards = new HashSet<>();
     }
 
     private Set<Card> getMemorySet(MemorySet set) {
-        return memoryMap.get().computeIfAbsent(set, value -> Sets.newConcurrentHashSet());
+        switch (set) {
+            case MANDATORY_ATTACKERS:
+                return memMandatoryAttackers;
+            case TRICK_ATTACKERS:
+                return memTrickAttackers;
+            case HELD_MANA_SOURCES_FOR_MAIN2:
+                return memHeldManaSources;
+            case HELD_MANA_SOURCES_FOR_DECLBLK:
+                return memHeldManaSourcesForCombat;
+            case HELD_MANA_SOURCES_FOR_ENEMY_DECLBLK:
+                return memHeldManaSourcesForEnemyCombat;
+            case HELD_MANA_SOURCES_FOR_NEXT_SPELL:
+                return memHeldManaSourcesForNextSpell;
+            case ATTACHED_THIS_TURN:
+                return memAttachedThisTurn;
+            case ANIMATED_THIS_TURN:
+                return memAnimatedThisTurn;
+            case BOUNCED_THIS_TURN:
+                return memBouncedThisTurn;
+            case ACTIVATED_THIS_TURN:
+                return memActivatedThisTurn;
+            case CHOSEN_FOG_EFFECT:
+                return memChosenFogEffect;
+            case MARKED_TO_AVOID_REENTRY:
+                return memMarkedToAvoidReentry;
+            case PAYS_TAP_COST:
+                return memPaysTapCost;
+            case PAYS_SAC_COST:
+                return memPaysSacCost;
+            case REVEALED_CARDS:
+                return memRevealedCards;
+            default:
+                return null;
+        }
     }
 
     /**
@@ -88,7 +146,10 @@ public class AiCardMemory {
         if (c == null) {
             return false;
         }
-        return getMemorySet(set).contains(c);
+
+        Set<Card> memorySet = getMemorySet(set);
+
+        return memorySet != null && memorySet.contains(c);
     }
 
     /**
@@ -100,7 +161,20 @@ public class AiCardMemory {
      * @return true, if at least one card with the given name is remembered in the given memory set
      */
     public boolean isRememberedCardByName(String cardName, MemorySet set) {
-        return getMemorySet(set).stream().anyMatch(c -> c.getName().equals(cardName));
+        Set<Card> memorySet = getMemorySet(set);
+
+        if (memorySet != null) {
+            Iterator<Card> it = memorySet.iterator();
+
+            while (it.hasNext()) {
+                Card c = it.next();
+                if (c.getName().equals(cardName)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -114,7 +188,20 @@ public class AiCardMemory {
      * @return true, if at least one card with the given name is remembered in the given memory set
      */
     public boolean isRememberedCardByName(String cardName, MemorySet set, Player owner) {
-        return getMemorySet(set).stream().anyMatch(c -> c.getName().equals(cardName) && c.getOwner().equals(owner));
+        Set<Card> memorySet = getMemorySet(set);
+
+        if (memorySet != null) {
+            Iterator<Card> it = memorySet.iterator();
+
+            while (it.hasNext()) {
+                Card c = it.next();
+                if (c.getName().equals(cardName) && c.getOwner().equals(owner)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -127,7 +214,14 @@ public class AiCardMemory {
     public boolean rememberCard(Card c, MemorySet set) {
         if (c == null)
             return false;
-        return getMemorySet(set).add(c);
+
+        Set<Card> memorySet = getMemorySet(set);
+
+        if (memorySet != null) {
+            memorySet.add(c);
+        }
+
+        return true;
     }
 
     /**
@@ -144,7 +238,14 @@ public class AiCardMemory {
         if (!isRememberedCard(c, set)) {
             return false;
         }
-        return getMemorySet(set).remove(c);
+
+        Set<Card> memorySet = getMemorySet(set);
+
+        if (memorySet != null) {
+            memorySet.remove(c);
+        }
+
+        return true;
     }
 
     /**
@@ -155,11 +256,19 @@ public class AiCardMemory {
      * @return true, if at least one card with the given name was previously remembered in the given memory set and was successfully forgotten
      */
     public boolean forgetAnyCardWithName(String cardName, MemorySet set) {
-        for (Card c : getMemorySet(set)) {
-            if (c.getName().equals(cardName)) {
-                return forgetCard(c, set);
+        Set<Card> memorySet = getMemorySet(set);
+
+        if (memorySet != null) {
+            Iterator<Card> it = memorySet.iterator();
+
+            while (it.hasNext()) {
+                Card c = it.next();
+                if (c.getName().equals(cardName)) {
+                    return forgetCard(c, set);
+                }
             }
         }
+        
         return false;
     }
 
@@ -172,11 +281,19 @@ public class AiCardMemory {
      * @return true, if at least one card with the given name was previously remembered in the given memory set and was successfully forgotten
      */
     public boolean forgetAnyCardWithName(String cardName, MemorySet set, Player owner) {
-        for (Card c : getMemorySet(set)) {
-            if (c.getName().equals(cardName) && c.getOwner().equals(owner)) {
-                return forgetCard(c, set);
+        Set<Card> memorySet = getMemorySet(set);
+
+        if (memorySet != null) {
+            Iterator<Card> it = memorySet.iterator();
+
+            while (it.hasNext()) {
+                Card c = it.next();
+                if (c.getName().equals(cardName) && c.getOwner().equals(owner)) {
+                    return forgetCard(c, set);
+                }
             }
         }
+
         return false;
     }
 
@@ -270,4 +387,4 @@ public class AiCardMemory {
     public static boolean isMemorySetEmpty(AiController aic, MemorySet set) {
         return aic.getCardMemory().isMemorySetEmpty(set);
     }
-}
+}

forge-ai/src/main/java/forge/ai/AiCostDecision.java

@@ -1,13 +1,12 @@
 package forge.ai;
 
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
-
-import forge.ai.AiCardMemory.MemorySet;
 import forge.card.CardType;
 import forge.card.MagicColor;
 import forge.game.Game;
 import forge.game.GameEntityCounterTable;
-import forge.game.ability.AbilityUtils;
 import forge.game.card.*;
 import forge.game.cost.*;
 import forge.game.keyword.Keyword;
@@ -33,10 +32,6 @@ public class AiCostDecision extends CostDecisionMakerBase {
 
         discarded = new CardCollection();
         tapped = new CardCollection();
-        Set<Card> tappedForMana = AiCardMemory.getMemorySet(ai0, MemorySet.PAYS_TAP_COST);
-        if (tappedForMana != null) {
-            tapped.addAll(tappedForMana);
-        }
     }
 
     @Override
@@ -46,14 +41,6 @@ public class AiCostDecision extends CostDecisionMakerBase {
         return PaymentDecision.number(c);
     }
 
-    @Override
-    public PaymentDecision visit(CostBehold cost) {
-        final String type = cost.getType();
-        CardCollectionView hand = player.getCardsIn(cost.getRevealFrom());
-        hand = CardLists.getValidCards(hand, type.split(";"), player, source, ability);
-        return hand.isEmpty() ? null : PaymentDecision.card(getBestCreatureAI(hand));
-    }
-
     @Override
     public PaymentDecision visit(CostChooseColor cost) {
         int c = cost.getAbilityAmount(ability);
@@ -64,18 +51,11 @@ public class AiCostDecision extends CostDecisionMakerBase {
 
     @Override
     public PaymentDecision visit(CostChooseCreatureType cost) {
-        String choice = player.getController().chooseSomeType("Creature", ability, CardType.getAllCreatureTypes());
+        String choice = player.getController().chooseSomeType("Creature", ability, CardType.getAllCreatureTypes(),
+                Lists.newArrayList());
         return PaymentDecision.type(choice);
     }
 
-    @Override
-    public PaymentDecision visit(CostCollectEvidence cost) {
-        int c = cost.getAbilityAmount(ability);
-        CardCollectionView chosen = ComputerUtil.chooseCollectEvidence(player, cost, source, c, ability, isEffect());
-
-        return null == chosen ? null : PaymentDecision.card(chosen);
-    }
-
     @Override
     public PaymentDecision visit(CostDiscard cost) {
         final String type = cost.getType();
@@ -117,13 +97,13 @@ public class AiCostDecision extends CostDecisionMakerBase {
                 Card chosen;
                 if (!discardMe.isEmpty()) {
                     chosen = Aggregates.random(discardMe);
-                    discardMe = CardLists.filter(discardMe, CardPredicates.sharesNameWith(chosen).negate());
+                    discardMe = CardLists.filter(discardMe, Predicates.not(CardPredicates.sharesNameWith(chosen)));
                 } else {
                     final Card worst = ComputerUtilCard.getWorstAI(hand);
                     chosen = worst != null ? worst : Aggregates.random(hand);
                 }
                 differentNames.add(chosen);
-                hand = CardLists.filter(hand, CardPredicates.sharesNameWith(chosen).negate());
+                hand = CardLists.filter(hand, Predicates.not(CardPredicates.sharesNameWith(chosen)));
                 c--;
             }
             return PaymentDecision.card(differentNames);
@@ -159,62 +139,29 @@ public class AiCostDecision extends CostDecisionMakerBase {
         return decision;
     }
 
-    @Override
-    public PaymentDecision visit(CostPromiseGift cost) {
-        if (!cost.canPay(ability, player, isEffect())) {
-            return null;
-        }
-        List<Player> res = cost.getPotentialPlayers(player, ability);
-        // I should only choose one of these right?
-        // TODO Choose the "worst" player.
-        Collections.shuffle(res);
-
-        return PaymentDecision.players(res.subList(0, 1));
-    }
-
     @Override
     public PaymentDecision visit(CostExile cost) {
-        String type = cost.getType();
         if (cost.payCostFromSource()) {
             return PaymentDecision.card(source);
         }
 
-        if (type.equals("All")) {
+        if (cost.getType().equals("All")) {
             return PaymentDecision.card(player.getCardsIn(cost.getFrom()));
-        } else if (type.contains("FromTopGrave")) {
-            return null;
-        } else if (type.contains("+withTotalCMCGE")) {
-            String strAmount = type.split("withTotalCMCGE")[1];
-            int amount = AbilityUtils.calculateAmount(source, strAmount, ability);
-            String typeCleaned = TextUtil.fastReplace(type, TextUtil.concatNoSpace("+withTotalCMCGE", strAmount), "");
-            CardCollection valid = CardLists.getValidCards(player.getGame().getCardsIn(cost.getFrom().get(0)), typeCleaned, player, source, ability);
-            CardCollection chosen = new CardCollection();
-
-            CardLists.sortByCmcDesc(valid);
-            Collections.reverse(valid);
-
-            int totalCMC = 0;
-            for (Card card : valid) {
-                totalCMC += card.getCMC();
-                chosen.add(card);
-                if (totalCMC >= amount) {
-                    return PaymentDecision.card(chosen);
-                }
-            }
-
+        }
+        else if (cost.getType().contains("FromTopGrave")) {
             return null;
         }
 
         int c = cost.getAbilityAmount(ability);
 
-        if (cost.from.size() == 1 && cost.getFrom().get(0).equals(ZoneType.Library)) {
+        if (cost.getFrom().equals(ZoneType.Library)) {
             return PaymentDecision.card(player.getCardsIn(ZoneType.Library, c));
         }
         else if (cost.zoneRestriction == 0) {
             // TODO Determine exile from same zone for AI
             return null;
         } else {
-            CardCollectionView chosen = ComputerUtil.chooseExileFrom(player, cost, source, c, ability, isEffect());
+            CardCollectionView chosen = ComputerUtil.chooseExileFrom(player, cost, source, c, ability);
             return null == chosen ? null : PaymentDecision.card(chosen);
         }
     }
@@ -223,7 +170,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
     public PaymentDecision visit(CostExileFromStack cost) {
         List<SpellAbility> chosen = Lists.newArrayList();
         for (SpellAbilityStackInstance si :source.getGame().getStack()) {
-            SpellAbility sp = si.getSpellAbility().getRootAbility();
+            SpellAbility sp = si.getSpellAbility(true).getRootAbility();
             if (si.getSourceCard().isValid(cost.getType().split(";"), source.getController(), source, sp)) {
                 chosen.add(sp);
             }
@@ -288,20 +235,6 @@ public class AiCostDecision extends CostDecisionMakerBase {
         return PaymentDecision.number(c);
     }
 
-    @Override
-    public PaymentDecision visit(final CostForage cost) {
-        CardCollection food = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), CardPredicates.isType("Food"), CardPredicates.canBeSacrificedBy(ability, isEffect()));
-        CardCollection exile = CardLists.filter(player.getCardsIn(ZoneType.Graveyard), CardPredicates.canExiledBy(ability, isEffect()));
-        if (!food.isEmpty()) {
-            final AiController aic = ((PlayerControllerAi)player.getController()).getAi();
-            CardCollectionView list = aic.chooseSacrificeType("Food", ability, isEffect(), 1, null);
-            return list == null ? null : PaymentDecision.card(list);
-        } else {
-            CardCollectionView chosen = ComputerUtil.chooseExileFromList(player, exile, source, 3, ability, isEffect());
-            return null == chosen ? null : PaymentDecision.card(chosen);
-        }
-    }
-
     @Override
     public PaymentDecision visit(CostRollDice cost) {
         int c = cost.getAbilityAmount(ability);
@@ -368,6 +301,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
         if (!player.canPayLife(c, isEffect(), ability)) {
             return null;
         }
+        // activator.payLife(c, null);
         return PaymentDecision.number(c);
     }
 
@@ -400,7 +334,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
         list = CardLists.getValidCards(list, cost.getType().split(";"), player, source, ability);
 
         if (cost.isSameZone()) {
-            // Jötun Grunt
+            // Jotun Grunt
             // TODO: improve AI
             final FCollectionView<Player> players = game.getPlayers();
             for (Player p : players) {
@@ -452,6 +386,24 @@ public class AiCostDecision extends CostDecisionMakerBase {
             return null;
         }
 
+        if ("DontPayTapCostWithManaSources".equals(source.getSVar("AIPaymentPreference"))) {
+            CardCollectionView toExclude =
+                    CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), type.split(";"),
+                            ability.getActivatingPlayer(), ability.getHostCard(), ability);
+            toExclude = CardLists.filter(toExclude, new Predicate<Card>() {
+                @Override
+                public boolean apply(Card card) {
+                    for (final SpellAbility sa : card.getSpellAbilities()) {
+                        if (sa.isManaAbility() && sa.getPayCosts().hasTapCost()) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            });
+            exclude.addAll(toExclude);
+        }
+
         String totalP = "";
         CardCollectionView totap;
         if (isVehicle) {
@@ -546,14 +498,14 @@ public class AiCostDecision extends CostDecisionMakerBase {
     }
 
     @Override
-    public PaymentDecision visit(CostRevealChosen cost) {
+    public PaymentDecision visit(CostRevealChosenPlayer cost) {
         return PaymentDecision.number(1);
     }
 
     protected int removeCounter(GameEntityCounterTable table, List<Card> prefs, CounterEnumType cType, int stillToRemove) {
         int removed = 0;
         if (!prefs.isEmpty() && stillToRemove > 0) {
-            prefs.sort(CardPredicates.compareByCounterType(cType));
+            Collections.sort(prefs, CardPredicates.compareByCounterType(cType));
 
             for (Card prefCard : prefs) {
                 // already enough removed
@@ -635,20 +587,23 @@ public class AiCostDecision extends CostDecisionMakerBase {
 
         // filter for negative counters
         if (c > toRemove && cost.counter == null) {
-            List<Card> negatives = CardLists.filter(typeList, crd -> {
-                for (CounterType cType : table.filterToRemove(crd).keySet()) {
-                    if (ComputerUtil.isNegativeCounter(cType, crd)) {
-                        return true;
+            List<Card> negatives = CardLists.filter(typeList, new Predicate<Card>() {
+                @Override
+                public boolean apply(final Card crd) {
+                    for (CounterType cType : table.filterToRemove(crd).keySet()) {
+                        if (ComputerUtil.isNegativeCounter(cType, crd)) {
+                            return true;
+                        }
                     }
+                    return false;
                 }
-                return false;
             });
 
             if (!negatives.isEmpty()) {
                 // TODO sort negatives to remove from best Cards first?
                 for (final Card crd : negatives) {
                     for (Map.Entry<CounterType, Integer> e : table.filterToRemove(crd).entrySet()) {
-                        if (ComputerUtil.isNegativeCounter(e.getKey(), crd) && crd.canRemoveCounters(e.getKey())) {
+                        if (ComputerUtil.isNegativeCounter(e.getKey(), crd)) {
                             int over = Math.min(e.getValue(), c - toRemove);
                             if (over > 0) {
                                 toRemove += over;
@@ -663,13 +618,16 @@ public class AiCostDecision extends CostDecisionMakerBase {
         // filter for useless counters
         // they have no effect on the card, if they are there or removed
         if (c > toRemove && cost.counter == null) {
-            List<Card> useless = CardLists.filter(typeList, crd -> {
-                for (CounterType ctype : table.filterToRemove(crd).keySet()) {
-                    if (ComputerUtil.isUselessCounter(ctype, crd)) {
-                        return true;
+            List<Card> useless = CardLists.filter(typeList, new Predicate<Card>() {
+                @Override
+                public boolean apply(final Card crd) {
+                    for (CounterType ctype : table.filterToRemove(crd).keySet()) {
+                        if (ComputerUtil.isUselessCounter(ctype, crd)) {
+                            return true;
+                        }
                     }
+                    return false;
                 }
-                return false;
             });
 
             if (!useless.isEmpty()) {
@@ -697,16 +655,19 @@ public class AiCostDecision extends CostDecisionMakerBase {
         // try to remove Quest counter on something with enough counters for the
         // effect to continue
         if (c > toRemove && (cost.counter == null || cost.counter.is(CounterEnumType.QUEST))) {
-            List<Card> prefs = CardLists.filter(typeList, crd -> {
-                // a Card without MaxQuestEffect doesn't need any Quest
-                // counters
-                int e = 0;
-                if (crd.hasSVar("MaxQuestEffect")) {
-                    e = Integer.parseInt(crd.getSVar("MaxQuestEffect"));
+            List<Card> prefs = CardLists.filter(typeList, new Predicate<Card>() {
+                @Override
+                public boolean apply(final Card crd) {
+                    // a Card without MaxQuestEffect doesn't need any Quest
+                    // counters
+                    int e = 0;
+                    if (crd.hasSVar("MaxQuestEffect")) {
+                        e = Integer.parseInt(crd.getSVar("MaxQuestEffect"));
+                    }
+                    return crd.getCounters(CounterEnumType.QUEST) > e;
                 }
-                return crd.getCounters(CounterEnumType.QUEST) > e;
             });
-            prefs.sort(Collections.reverseOrder(CardPredicates.compareByCounterType(CounterEnumType.QUEST)));
+            Collections.sort(prefs, Collections.reverseOrder(CardPredicates.compareByCounterType(CounterEnumType.QUEST)));
 
             for (final Card crd : prefs) {
                 int e = 0;
@@ -759,7 +720,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
             }
         }
 
-        // if table is empty, then no counter was removed
+        // if table is empty, than no counter was removed
         return table.isEmpty() ? null : PaymentDecision.counters(table);
     }
 
@@ -835,12 +796,12 @@ public class AiCostDecision extends CostDecisionMakerBase {
 
     @Override
     public PaymentDecision visit(CostUnattach cost) {
-        final CardCollection cardToUnattach = cost.findCardToUnattach(source, player, ability);
-        if (cardToUnattach.isEmpty()) {
+        final Card cardToUnattach = cost.findCardToUnattach(source, player, ability);
+        if (cardToUnattach == null) {
             // We really shouldn't be able to get here if there's nothing to unattach
             return null;
         }
-        return PaymentDecision.card(cardToUnattach.getFirst());
+        return PaymentDecision.card(cardToUnattach);
     }
 
     @Override

forge-ai/src/main/java/forge/ai/AiDeckStatistics.java

@@ -1,125 +0,0 @@
-package forge.ai;
-
-import forge.card.CardRules;
-import forge.card.CardType;
-import forge.deck.CardPool;
-import forge.deck.Deck;
-import forge.deck.DeckSection;
-import forge.game.card.Card;
-import forge.game.player.Player;
-import forge.item.PaperCard;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class AiDeckStatistics {
-
-    public float averageCMC = 0;
-    // TODO implement this. Use a numerically stable algorithm from
-    // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Weighted_incremental_algorithm
-    public float stddevCMC = 0;
-    public int maxCost = 0;
-    public int maxColoredCost = 0;
-
-    // in WUBRGC order from ManaCost.getColorShardCounts()
-    public int[] maxPips = null;
-    // public int[] numSources = new int[6];
-    public int numLands = 0;
-    public AiDeckStatistics(float averageCMC, float stddevCMC, int maxCost, int maxColoredCost, int[] maxPips, int numLands) {
-        this.averageCMC = averageCMC;
-        this.stddevCMC = stddevCMC;
-        this.maxCost = maxCost;
-        this.maxColoredCost = maxColoredCost;
-        this.maxPips = maxPips;
-        this.numLands = numLands;
-    }
-
-    public static AiDeckStatistics fromCards(List<Card> cards) {
-        int totalCMC = 0;
-        int totalCount = 0;
-        int numLands = 0;
-        int maxCost = 0;
-        int[] maxPips = new int[6];
-        int maxColoredCost = 0;
-        for (Card c : cards) {
-            CardRules rules = c.getRules();
-            if (rules == null) {
-                System.err.println(c + " CardRules is null" + (c.isToken() ? "/token" : "."));
-                continue;
-            }
-            CardType type = rules.getType();
-            if (type.isLand()) {
-                numLands += 1;
-            } else {
-                int cost = rules.getManaCost().getCMC();
-                // TODO use alternate casting costs for this, free spells will usually be cast for free
-                maxCost = Math.max(maxCost, cost);
-                totalCMC += cost;
-                totalCount++;
-                int[] pips = rules.getManaCost().getColorShardCounts();
-                int colored_pips = 0;
-                for (int i = 0; i < pips.length; i++) {
-                    maxPips[i] = Math.max(maxPips[i], pips[i]);
-                    if (i < 5) {
-                        colored_pips += pips[i];
-                    }
-                }
-                maxColoredCost = Math.max(maxColoredCost, colored_pips);
-            }
-
-            // TODO implement the number of mana sources
-            // find the sources
-            // What about non-mana-ability mana sources?
-            // fetchlands, ramp spells, etc
-
-        }
-
-        return new AiDeckStatistics(totalCount == 0 ? 0 : totalCMC / (float)totalCount,
-                0, // TODO use https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance
-                maxCost,
-                maxColoredCost,
-                maxPips,
-                numLands
-                );
-    }
-
-
-    public static AiDeckStatistics fromDeck(Deck deck, Player player) {
-        List<Card> cardlist = new ArrayList<>();
-        for (final Map.Entry<DeckSection, CardPool> deckEntry : deck) {
-            switch (deckEntry.getKey()) {
-                case Main:
-                case Commander:
-                    for (final Map.Entry<PaperCard, Integer> poolEntry : deckEntry.getValue()) {
-                        Card card = Card.fromPaperCard(poolEntry.getKey(), player);
-                        cardlist.add(card);
-                    }
-                    break;
-                default:
-                    break; //ignore other sections
-            }
-        }
-
-        return fromCards(cardlist);
-    }
-
-    public static AiDeckStatistics fromPlayer(Player player) {
-        Deck deck = player.getRegisteredPlayer().getDeck();
-        if (deck.isEmpty()) {
-            // we're in a test or some weird match, search through the hand and library and build the decklist
-            List<Card> cardlist = new ArrayList<>();
-            for (Card c : player.getAllCards()) {
-                if (c.getPaperCard() == null) {
-                    continue;
-                }
-                cardlist.add(c);
-            }
-
-            return fromCards(cardlist);
-        }
-
-        return fromDeck(deck, player);
-    }
-
-}

forge-ai/src/main/java/forge/ai/AiPlayerPredicates.java

@@ -11,24 +11,28 @@ import forge.game.zone.ZoneType;
 
 public final class AiPlayerPredicates {
 
-    public static Comparator<Player> compareByZoneValue(final String type, final ZoneType zone, final SpellAbility sa) {
-        return (arg0, arg1) -> {
-            CardCollectionView list0 = AbilityUtils.filterListByType(arg0.getCardsIn(zone), type, sa);
-            CardCollectionView list1 = AbilityUtils.filterListByType(arg1.getCardsIn(zone), type, sa);
+    public static final Comparator<Player> compareByZoneValue(final String type, final ZoneType zone,
+            final SpellAbility sa) {
+        return new Comparator<Player>() {
+            @Override
+            public int compare(Player arg0, Player arg1) {
+                CardCollectionView list0 = AbilityUtils.filterListByType(arg0.getCardsIn(zone), type, sa);
+                CardCollectionView list1 = AbilityUtils.filterListByType(arg1.getCardsIn(zone), type, sa);
 
-            int v0, v1;
+                int v0, v1;
 
-            if ((CardLists.getNotType(list0, "Creature").isEmpty())
-                    && (CardLists.getNotType(list1, "Creature").isEmpty())) {
-                v0 = ComputerUtilCard.evaluateCreatureList(list0);
-                v1 = ComputerUtilCard.evaluateCreatureList(list1);
-            } // otherwise evaluate both lists by CMC and pass only if human
-              // permanents are less valuable
-            else {
-                v0 = ComputerUtilCard.evaluatePermanentList(list0);
-                v1 = ComputerUtilCard.evaluatePermanentList(list1);
+                if ((CardLists.getNotType(list0, "Creature").isEmpty())
+                        && (CardLists.getNotType(list1, "Creature").isEmpty())) {
+                    v0 = ComputerUtilCard.evaluateCreatureList(list0);
+                    v1 = ComputerUtilCard.evaluateCreatureList(list1);
+                } // otherwise evaluate both lists by CMC and pass only if human
+                  // permanents are less valuable
+                else {
+                    v0 = ComputerUtilCard.evaluatePermanentList(list0);
+                    v1 = ComputerUtilCard.evaluatePermanentList(list1);
+                }
+                return Integer.compare(v0, v1);
             }
-            return Integer.compare(v0, v1);
         };
     }
 }

forge-ai/src/main/java/forge/ai/AiProfileUtil.java

@@ -17,18 +17,19 @@
  */
 package forge.ai;
 
-import forge.LobbyPlayer;
-import forge.util.Aggregates;
-import forge.util.FileUtil;
-import forge.util.TextUtil;
-import org.apache.commons.lang3.ArrayUtils;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.ArrayUtils;
+
+import forge.LobbyPlayer;
+import forge.util.Aggregates;
+import forge.util.FileUtil;
+import forge.util.TextUtil;
+
 /**
  * Holds default AI personality profile values in an enum.
  * Loads profile from the given text file when setProfile is called.
@@ -46,26 +47,6 @@ public class AiProfileUtil {
     public static final String AI_PROFILE_RANDOM_MATCH = "Random (Every Match)";
     public static final String AI_PROFILE_RANDOM_DUEL = "Random (Every Game)";
 
-    public enum AISideboardingMode {
-        Off,
-        AI,
-        HumanForAI;
-
-        public static AISideboardingMode normalizedValueOf(String value) {
-            return valueOf(value.replace(" ", ""));
-        }
-    }
-
-    private static AISideboardingMode aiSideboardingMode = AISideboardingMode.Off;
-
-    public static AISideboardingMode getAISideboardingMode() {
-        return aiSideboardingMode;
-    }
-
-    public static void setAiSideboardingMode(AISideboardingMode mode) {
-        aiSideboardingMode = mode;
-    }
-
     /** Builds an AI profile file name with full relative 
      * path based on the profile name. 
      * @param profileName the name of the profile.
@@ -92,7 +73,7 @@ public class AiProfileUtil {
      * Load a single profile.
      * @param profileName a profile to load.
      */
-    private static Map<AiProps, String> loadProfile(final String profileName) {
+    private static final Map<AiProps, String> loadProfile(final String profileName) {
         Map<AiProps, String> profileMap = new HashMap<>();
 
         List<String> lines = FileUtil.readFile(buildFileName(profileName));
@@ -146,9 +127,9 @@ public class AiProfileUtil {
         if (children == null) {
             System.err.println("AIProfile > can't find AI profile directory!");
         } else {
-            for (String child : children) {
-                if (child.endsWith(AI_PROFILE_EXT)) {
-                    availableProfiles.add(child.substring(0, child.length() - AI_PROFILE_EXT.length()));
+            for (int i = 0; i < children.length; i++) {
+                if (children[i].endsWith(AI_PROFILE_EXT)) {
+                    availableProfiles.add(children[i].substring(0, children[i].length() - AI_PROFILE_EXT.length()));
                 }
             }
         }

forge-ai/src/main/java/forge/ai/AiProps.java

@@ -134,18 +134,7 @@ public enum AiProps { /** */
     FLASH_BUFF_AURA_CHANCE_TO_RESPOND_TO_STACK("100"),
     BLINK_RELOAD_PLANESWALKER_CHANCE("30"), /** */
     BLINK_RELOAD_PLANESWALKER_MAX_LOYALTY("2"), /** */
-    BLINK_RELOAD_PLANESWALKER_LOYALTY_DIFF("2"),
-    SACRIFICE_DEFAULT_PREF_ENABLE("true"),
-    SACRIFICE_DEFAULT_PREF_MIN_CMC("0"),
-    SACRIFICE_DEFAULT_PREF_MAX_CMC("2"),
-    SACRIFICE_DEFAULT_PREF_ALLOW_TOKENS("true"),
-    SACRIFICE_DEFAULT_PREF_MAX_CREATURE_EVAL("135"),
-    SIDEBOARDING_ENABLE("true"),
-    SIDEBOARDING_CHANCE_PER_CARD("50"),
-    SIDEBOARDING_CHANCE_ON_WIN("0"),
-    SIDEBOARDING_IN_LIMITED_FORMATS("false"),
-    SIDEBOARDING_SHARED_TYPE_ONLY("false"),
-    SIDEBOARDING_PLANESWALKER_EQ_CREATURE("false");
+    BLINK_RELOAD_PLANESWALKER_LOYALTY_DIFF("2"); /** */
     // Experimental features, must be promoted or removed after extensive testing and, ideally, defaulting
     // <-- There are no experimental options here -->
 

forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java

@@ -1,9 +1,11 @@
 package forge.ai;
 
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
 import forge.card.CardStateName;
@@ -14,6 +16,7 @@ import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.cost.CostPart;
 import forge.game.cost.CostPayEnergy;
 import forge.game.cost.CostPutCounter;
@@ -21,7 +24,6 @@ import forge.game.cost.CostRemoveCounter;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
-import forge.game.spellability.OptionalCost;
 import forge.game.spellability.OptionalCostValue;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
@@ -32,14 +34,23 @@ public class ComputerUtilAbility {
         if (!game.getStack().isEmpty() || !game.getPhaseHandler().getPhase().isMain()) {
             return null;
         }
-        CardCollection landList = new CardCollection(player.getCardsIn(ZoneType.Hand));
+        final CardCollection hand = new CardCollection(player.getCardsIn(ZoneType.Hand));
+        hand.addAll(player.getCardsIn(ZoneType.Exile));
+        CardCollection landList = CardLists.filter(hand, Presets.LANDS);
 
         //filter out cards that can't be played
-        landList = CardLists.filter(landList, c -> {
-            if (!c.hasPlayableLandFace()) {
-                return false;
+        landList = CardLists.filter(landList, new Predicate<Card>() {
+            @Override
+            public boolean apply(final Card c) {
+                if (!c.getSVar("NeedsToPlay").isEmpty()) {
+                    final String needsToPlay = c.getSVar("NeedsToPlay");
+                    CardCollection list = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), needsToPlay, c.getController(), c, null);
+                    if (list.isEmpty()) {
+                        return false;
+                    }
+                }
+                return player.canPlayLand(c);
             }
-            return player.canPlayLand(c, false, c.getFirstSpellAbility());
         });
 
         final CardCollection landsNotInHand = new CardCollection(player.getCardsIn(ZoneType.Graveyard));
@@ -48,7 +59,7 @@ public class ComputerUtilAbility {
             landsNotInHand.add(player.getCardsIn(ZoneType.Library).get(0));
         }
         for (final Card crd : landsNotInHand) {
-            if (!(crd.hasPlayableLandFace() || (crd.isFaceDown() && crd.getState(CardStateName.Original).getType().isLand()))) {
+            if (!(crd.isLand() || (crd.isFaceDown() && crd.getState(CardStateName.Original).getType().isLand()))) {
                 continue;
             }
             if (!crd.mayPlay(player).isEmpty()) {
@@ -65,14 +76,12 @@ public class ComputerUtilAbility {
         CardCollection all = new CardCollection(player.getCardsIn(ZoneType.Hand));
 
         all.addAll(player.getCardsIn(ZoneType.Graveyard));
-        for (Player p : game.getPlayers()) {
-            if (!p.getCardsIn(ZoneType.Library).isEmpty()) {
-                all.add(p.getCardsIn(ZoneType.Library).get(0));
-            }
+        all.addAll(player.getCardsIn(ZoneType.Command));
+        if (!player.getCardsIn(ZoneType.Library).isEmpty()) {
+            all.add(player.getCardsIn(ZoneType.Library).get(0));
         }
-        all.addAll(game.getCardsIn(ZoneType.Command));
-        all.addAll(game.getCardsIn(ZoneType.Exile));
-        all.addAll(game.getCardsIn(ZoneType.Battlefield));
+        all.addAll(game.getPlayers().getCardsIn(ZoneType.Exile));
+        all.addAll(game.getPlayers().getCardsIn(ZoneType.Battlefield));
         return all;
     }
 
@@ -90,13 +99,13 @@ public class ComputerUtilAbility {
         List<SpellAbility> originListWithAddCosts = Lists.newArrayList();
         for (SpellAbility sa : originList) {
             // If this spell has alternative additional costs, add them instead of the unmodified SA itself
-            sa.setActivatingPlayer(player);
+            sa.setActivatingPlayer(player, true);
             originListWithAddCosts.addAll(GameActionUtil.getAdditionalCostSpell(sa));
         }
 
         for (SpellAbility sa : originListWithAddCosts) {
             // determine which alternative costs are cheaper than the original and prioritize them
-            List<SpellAbility> saAltCosts = GameActionUtil.getAlternativeCosts(sa, player, false);
+            List<SpellAbility> saAltCosts = GameActionUtil.getAlternativeCosts(sa, player);
             List<SpellAbility> priorityAltSa = Lists.newArrayList();
             List<SpellAbility> otherAltSa = Lists.newArrayList();
             for (SpellAbility altSa : saAltCosts) {
@@ -117,16 +126,12 @@ public class ComputerUtilAbility {
 
         final List<SpellAbility> result = Lists.newArrayList();
         for (SpellAbility sa : newAbilities) {
-            sa.setActivatingPlayer(player);
+            sa.setActivatingPlayer(player, true);
 
             // Optional cost selection through the AI controller
             boolean choseOptCost = false;
             List<OptionalCostValue> list = GameActionUtil.getOptionalCostValues(sa);
             if (!list.isEmpty()) {
-                // still add base spell in case of Promise Gift
-                if (list.stream().anyMatch(ocv -> ocv.getType().equals(OptionalCost.PromiseGift))) {
-                    result.add(sa);
-                }
                 list = player.getController().chooseOptionalCosts(sa, list);
                 if (!list.isEmpty()) {
                     choseOptCost = true;
@@ -150,13 +155,13 @@ public class ComputerUtilAbility {
             return null;
         }
 
-        SpellAbility tgtSA = it.next().getSpellAbility();
+        SpellAbility tgtSA = it.next().getSpellAbility(true);
         // Grab the topmost spellability that isn't this SA and use that for comparisons
         if (sa.equals(tgtSA) && game.getStack().size() > 1) {
             if (!it.hasNext()) {
                 return null;
             }
-            tgtSA = it.next().getSpellAbility();
+            tgtSA = it.next().getSpellAbility(true);
         }
         return tgtSA;
     }
@@ -201,7 +206,7 @@ public class ComputerUtilAbility {
             }
         }
         for (SpellAbilityStackInstance si : ai.getGame().getStack()) {
-            SpellAbility ab = si.getSpellAbility();
+            SpellAbility ab = si.getSpellAbility(false);
             if (ab != null && ab.getApi() == api && si.getTargetChoices() != null) {
                 for (Card c : cardList) {
                     // TODO: somehow ensure that the detected SA won't be countered
@@ -249,27 +254,10 @@ public class ComputerUtilAbility {
             }
 
             // deprioritize planar die roll marked with AIRollPlanarDieParams:LowPriority$ True
-            if (ApiType.RollPlanarDice == a.getApi() || ApiType.RollPlanarDice == b.getApi()) {
-                Card hostCardForGame = a.getHostCard();
-                if (hostCardForGame == null) {
-                    if (b.getHostCard() != null) {
-                        hostCardForGame = b.getHostCard();
-                    } else {
-                        return 0; // fallback if neither SA have a host card somehow
-                    }
-                }
-                Game game = hostCardForGame.getGame();
-                if (game.getActivePlanes() != null) {
-                    for (Card c : game.getActivePlanes()) {
-                        if (c.hasSVar("AIRollPlanarDieParams") && c.getSVar("AIRollPlanarDieParams").toLowerCase().matches(".*lowpriority\\$\\s*true.*")) {
-                            if (ApiType.RollPlanarDice == a.getApi()) {
-                                return 1;
-                            } else {
-                                return -1;
-                            }
-                        }
-                    }
-                }
+            if (ApiType.RollPlanarDice == a.getApi() && a.getHostCard() != null && a.getHostCard().hasSVar("AIRollPlanarDieParams") && a.getHostCard().getSVar("AIRollPlanarDieParams").toLowerCase().matches(".*lowpriority\\$\\s*true.*")) {
+                return 1;
+            } else if (ApiType.RollPlanarDice == b.getApi() && b.getHostCard() != null && b.getHostCard().hasSVar("AIRollPlanarDieParams") && b.getHostCard().getSVar("AIRollPlanarDieParams").toLowerCase().matches(".*lowpriority\\$\\s*true.*")) {
+                return -1;
             }
 
             // deprioritize pump spells with pure energy cost (can be activated last,
@@ -358,7 +346,7 @@ public class ComputerUtilAbility {
                 }
                 // 1. increase chance of using Surge effects
                 // 2. non-surged versions are usually inefficient
-                if (source.hasKeyword(Keyword.SURGE) && !sa.isSurged()) {
+                if (source.getOracleText().contains("surge cost") && !sa.isSurged()) {
                     p -= 9;
                 }
                 // move snap-casted spells to front
@@ -391,10 +379,8 @@ public class ComputerUtilAbility {
             }
 
             if (ApiType.DestroyAll == sa.getApi()) {
-                // check boardwipe earlier
                 p += 4;
             } else if (ApiType.Mana == sa.getApi()) {
-                // keep mana abilities for paying
                 p -= 9;
             }
 
@@ -405,7 +391,7 @@ public class ComputerUtilAbility {
 
             return p;
         }
-    }
+    };
 
     public static List<SpellAbility> sortCreatureSpells(final List<SpellAbility> all) {
         // try to smoothen power creep by making CMC less of a factor
@@ -414,7 +400,7 @@ public class ComputerUtilAbility {
             return all;
         }
         // TODO this doesn't account for nearly identical creatures where one is a newer but more cost efficient variant
-        creatures.sort(ComputerUtilCard.EvaluateCreatureSpellComparator);
+        Collections.sort(creatures, ComputerUtilCard.EvaluateCreatureSpellComparator);
         int idx = 0;
         for (int i = 0; i < all.size(); i++) {
             if (all.get(i).getApi() == ApiType.PermanentCreature) {