Merge branch 'master' into linkedAbilityV2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,7 +4,6 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-type: 'Bug'
 
 ---
 
@@ -32,6 +31,7 @@ If applicable, add screenshots to help explain your problem.
 **Smartphone (please complete the following information):**
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
 **Additional context**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,7 +4,6 @@ about: Suggest an idea for this project
 title: ''
 labels: ''
 assignees: ''
-type: 'Feature'
 
 ---
 

.github/workflows/maven-publish.yml

@@ -1,176 +0,0 @@
-name: Publish Desktop 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
-      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: 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 }}
-        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 -DskipTests -Dskip.flatten=true -e -T 1C release:clean release:prepare release:perform
-          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
-        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: 🔧 Install XML tools
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libxml2-utils
-
-      - name: 🔼 Bump versionCode in root POM
-        id: bump_version
-        run: |
-          cd /home/runner/work/forge/forge/
-          
-          current_version=$(xmllint --xpath "//*[local-name()='versionCode']/text()" pom.xml)
-          echo "Current versionCode: $current_version"
-
-          IFS='.' read -r major minor patch <<< "${current_version}"
-          new_patch=$(printf "%02d" $((10#$patch + 1)))
-          new_version="${major}.${minor}.${new_patch}"
-
-          sed -i -E "s|<versionCode>.*</versionCode>|<versionCode>${new_version}</versionCode>|" pom.xml
-
-          echo "version_code=${new_version}" >> $GITHUB_OUTPUT
-          
-      - name: ♻️ Restore {revision} in child POMs
-        run: |
-          find . -name pom.xml ! -path "./pom.xml" | while read -r pom; do
-            sed -i -E 's|<version>2\.0+\.[0-9]+(-SNAPSHOT)?</version>|<version>${revision}</version>|' "$pom"
-          done
-
-      - name: 💾 Commit restored {revision}
-        run: |
-          # Add only pom.xml files
-          find . -name pom.xml -exec git add {} \;
-
-          # Commit if there are changes
-          if git diff --cached --quiet; then
-            echo "No pom.xml changes to commit."
-          else
-            git commit -m "Restore POM files for preparation of next release" || echo "No changes to commit"
-            git push
-          fi
-
-      - 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/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/stale.yml

@@ -1,34 +0,0 @@
-# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
-#
-# You can adjust the behavior by modifying this file.
-# For more information, see:
-# https://github.com/actions/stale
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: '21 9 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/stale@v5
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: "This issue has not been updated in a while and has now been marked as stale. Stale messages will be auto closed."
-        stale-pr-message: 'This PR has not been updated in a while nad has been marked on stale. Stale PRs will be auto closed'
-        close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        exempt-issue-labels: 'keep'
-        exempt-pr-labels: 'awaiting-approval,work-in-progress,keep'
-        days-before-issue-stale: 30
-        days-before-pr-stale: 45
-        days-before-issue-close: 5
-        days-before-pr-close: 10

.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', '21']
+        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

@@ -1,48 +0,0 @@
-name: Maven test for settings
-
-on:
-  workflow_dispatch:
-
-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: Check settings after java setup
-      run: |
-        cat ${{ github.workspace }}/settings.xml
-        
-
-    - name: maven-settings-xml-action
-      uses: whelk-io/maven-settings-xml-action@v20
-      with:
-        servers: '[{ "id": "cardforge-repo", "username": "${{ secrets.FTP_USERNAME }}", "password": "Fake_password" }]'
-    
-    - name: Check settings after xml action
-      run: |
-        cat ~/.m2/settings.xml
-        
-    - name: Check settings after xml action
-      run: |
-        cat ${{ github.workspace }}/.mvn/local-settings.xml
-        
-    - name: Where are maven settings
-      run: |
-        mvn -X clean -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} | grep "settings"

.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
 
@@ -39,9 +36,6 @@ gen
 # Ignore macOS Spotlight rubbish
 .DS_Store
 
-# ignore vim swapfiles
-*.swp
-
 # TODO: specify what these ignores are for (releasing?)
 
 forge.profile.properties
@@ -66,9 +60,6 @@ forge-gui-mobile-dev/testAssets
 
 forge-gui/res/cardsfolder/*.bat
 
-# Generated changelog file
-forge-gui/release-files/CHANGES.txt
-
 forge-gui/res/PerSetTrackingResults
 forge-gui/res/decks
 forge-gui/res/layouts
@@ -87,10 +78,3 @@ forge-gui/tools/AllCards.json
 forge-gui/tools/EditionTrackingResults
 forge-gui/tools/PerSetTrackingResults
 
-*.tiled-session
-/forge-gui/res/adventure/*.tiled-project
-/forge-gui/res/adventure/*.tiled-session
-
-# Ignore python temporaries
-__pycache__
-*.pyc

.gitlab/issue_templates/Bug.md

@@ -0,0 +1,33 @@
+Summary
+
+(Summarize the bug encountered concisely)
+
+
+Steps to reproduce
+
+(How one can reproduce the issue - this is very important. Specific cards and specific actions especially)
+
+
+Which version of Forge are you on (Release, Snapshot? Desktop, Android?)
+
+
+What is the current bug behavior?
+
+(What actually happens)
+
+
+What is the expected correct behavior?
+
+(What you should see instead)
+
+
+Relevant logs and/or screenshots
+
+(Paste/Attach your game.log from the crash - please use code blocks (```)) Also, provide screenshots of the current state.
+
+
+Possible fixes
+
+(If you can, link to the line of code that might be responsible for the problem)
+
+/label ~needs-investigation

.gitlab/issue_templates/Feature.md

@@ -0,0 +1,15 @@
+Summary
+
+(Summarize the feature you wish concisely)
+
+
+Example screenshots
+
+(If this is a UI change, please provide an example screenshot of how this feature might work)
+
+
+Feature type
+
+(Where in Forge does this belong? e.g. Quest Mode, Deck Editor, Limited, Constructed, etc.)
+
+/label ~feature request

.mvn/local-settings.xml

@@ -1,11 +1,15 @@
+<!--
+    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">
-    <servers>
-        <server>
-            <id>cardforge-repo</id>
-            <username>${cardforge-repo.username}</username>
-            <password>${cardforge-repo.password}</password>
-        </server>
-    </servers>
+    <mirrors>
+        <mirror>
+            <id>4thline-repo-http-unblocker</id>
+            <mirrorOf>4thline-repo</mirrorOf>
+            <name></name>
+            <url>http://4thline.org/m2</url>
+        </mirror>
+    </mirrors>
 </settings>

.mvn/maven.config

@@ -1,2 +1 @@
---settings
-./.mvn/local-settings.xml
+--settings ./.mvn/local-settings.xml

CONTRIBUTING.md

@@ -1,195 +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
-
-- your 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
-
-The forge-ai project contains the computer opponent logic for gameplay. It includes decision-making algorithms for specific abilities, cards and turn phases.
-
-#### forge-core
-
-The forge-core project contains the core game engine, card mechanics, rules engine, and fundamental game logic. It includes the implementation of Magic: The Gathering rules, card interactions, and the game state management system.
-
-#### forge-game
-
-The forge-game project handles the game session management, player interactions, and game flow control. It includes implementations for multiplayer support, game modes, matchmaking, and game state persistence. This module bridges the core game engine with the user interface and networking components.
-
-#### forge-gui
-
-The forge-gui project contains the user interface components and rendering logic for the game. It includes the main game window, card displays, player interactions, and 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,105 +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
-- _(Note: **Android 11** is the minimum requirements with at least **6GB RAM** to run smoothly. You need to enable **"Install unknown apps"** for Forge to initialize and update itself)_
-- 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.
 
-<img width="1282" height="752" alt="Shandalar World" src="https://github.com/user-attachments/assets/9af31471-d688-442f-9418-9807d8635b72" />
+- 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.
 
-<img width="1282" height="752" alt="Quest Duels" src="https://github.com/user-attachments/assets/b9613b1c-e8c3-4320-8044-6922c519aad4" />
+- 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.
 
-### 🤖 AI Formats
-Test your skills against AI in multiple formats:
-- **Sealed**
-- **Draft**
-- **Commander**
-- **Cube**
+- Once everything builds, all errors should disappear.  You can now advance to Project launch.
 
-For comprehensive gameplay instructions, visit our [Gameplay Guide](https://github.com/Card-Forge/forge/wiki/Gameplay-Guide).
+### Project Launch
 
-<img width="1282" height="752" alt="Sealed" src="https://github.com/user-attachments/assets/ae603dbd-4421-4753-a333-87cb0a28d772" />
+#### Desktop
 
----
+This is the standard configuration used for releasing to Windows / Linux / MacOS.
 
-## 💬 Support & Community
+- Right-click on forge-gui-desktop > Run As... > Java Application > "Main - forge.view" > Ok
 
-Need help? Join our vibrant Discord community! 
-- 📜 Read the **#rules** and explore the **FAQ**.
-- ❓ Ask your questions in the **#help** channel for assistance.
+- The familiar Forge splash screen, etc. should appear.  Enjoy!
 
----
+#### Mobile (Desktop dev)
 
-## 🤝 Contributing to Forge
+This is the configuration used for doing mobile development using the Windows / Linux / MacOS front-end.  Knowledge of libgdx is helpful here.
 
-We love community contributions! Interested in helping? Check out our [Contributing Guidelines](CONTRIBUTING.md) for details on how to get started.
+- 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!
 
-## ℹ️ About Forge
+### Eclipse / Android SDK Integration
 
-Forge aims to deliver an immersive and customizable Magic: The Gathering experience for fans around the world. 
+Google no longer supports Android SDK releases for Eclipse.  That said, it is still possible to build and debug Android platforms.
 
-### 📊 Repository Statistics
+#### Android SDK
 
-| 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) |
+Reference SO for obtaining a specific release: https://stackoverflow.com/questions/27043522/where-can-i-download-an-older-version-of-the-android-sdk
 
----
+##### Windows
 
-**📄 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>
+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/Main.java

@@ -1,21 +0,0 @@
-package forge.adventure;
-
-import forge.GuiMobile;
-import forge.adventure.editor.EditorMainWindow;
-import forge.adventure.util.Config;
-import forge.gui.GuiBase;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-/**
- * Main entry point
- */
-public class Main {
-
-    public static void main(String[] args) {
-        GuiBase.setInterface(new GuiMobile(Files.exists(Paths.get("./res"))?"./":"../forge-gui/"));
-        GuiBase.setDeviceInfo(null, 0, 0, System.getProperty("user.home") + "/Downloads/");
-        new EditorMainWindow(Config.instance());
-    }
-}

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

@@ -1,175 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.DialogData;
-
-import javax.swing.JSpinner;
-import javax.swing.JTextField;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class ActionEdit extends FormPanel {
-    DialogData.ActionData currentData;
-
-    JTextField issueQuest = new JTextField();
-    JTextField characterFlagName = new JTextField();
-    JTextField mapFlagName = new JTextField();
-    JTextField questFlagName = new JTextField();
-    JTextField advanceCharacterFlag = new JTextField();
-    JTextField advanceMapFlag = new JTextField();
-    JTextField advanceQuestFlag = new JTextField();
-    JTextField battleWithActorID = new JTextField();
-    JTextField activateObjectID = new JTextField();
-    JTextField deleteMapObject = new JTextField();
-    JTextField setColorIdentity = new JTextField();
-    JSpinner addReputation = new JSpinner(new SpinnerNumberModel(0, -1000, 1000, 1));
-    JSpinner addLife = new JSpinner(new SpinnerNumberModel(0, -1000, 1000, 1));
-    JTextField POIReference = new JTextField();
-    JTextField removeItem = new JTextField();
-    JSpinner characterFlagValue = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
-    JSpinner mapFlagValue = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
-    JSpinner questFlagValue = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
-
-    private boolean updating=false;
-
-    public ActionEdit()
-    {
-
-        //todo: add info pane to explain primary usage
-
-        add("Issue Quest:",issueQuest);
-        add("Set Map Flag Name:",mapFlagName);
-        add("Map Flag value to set:",mapFlagValue);
-        add("Set Quest Flag name:",questFlagName);
-        add("Quest Flag value to set:",questFlagValue);
-        add("Set Character Flag name:",characterFlagName);
-        add("Character Flag value to set:",characterFlagValue);
-
-        add("Advance Map Flag name:",advanceMapFlag);
-        add("Advance Quest Flag name:",advanceQuestFlag);
-        add("Advance Character Flag name:",advanceCharacterFlag);
-        add("Battle with actor ID:",battleWithActorID);
-        add("Delete map object:",deleteMapObject);
-        add("Set color identity:",setColorIdentity);
-        add("Add Reputation:",addReputation);
-        add("Add Life:",addLife);
-        add("POI Reference:",POIReference);
-        add("Remove Item:",removeItem);
-
-        issueQuest.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        mapFlagName.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        mapFlagValue.getModel().addChangeListener(e -> ActionEdit.this.updateAction());
-        questFlagName.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        questFlagValue.getModel().addChangeListener(e -> ActionEdit.this.updateAction());
-        advanceMapFlag.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        advanceQuestFlag.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        battleWithActorID.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        activateObjectID.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        deleteMapObject.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        setColorIdentity.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        addLife.getModel().addChangeListener(e -> ActionEdit.this.updateAction());
-        addReputation.getModel().addChangeListener(e -> ActionEdit.this.updateAction());
-        POIReference.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-        removeItem.getDocument().addDocumentListener(new DocumentChangeListener(ActionEdit.this::updateAction));
-
-    }
-
-    private void updateAction() {
-        if(updating)
-            return;
-        if (currentData == null)
-            currentData = new DialogData.ActionData();
-
-        DialogData.ActionData.QuestFlag characterFlag = new DialogData.ActionData.QuestFlag();
-        characterFlag.key = characterFlagName.getText();
-        characterFlag.val = (int)characterFlagValue.getModel().getValue();
-        currentData.setCharacterFlag= characterFlag;
-
-        DialogData.ActionData.QuestFlag mapFlag = new DialogData.ActionData.QuestFlag();
-        mapFlag.key = mapFlagName.getText();
-        mapFlag.val = (int)mapFlagValue.getModel().getValue();
-        currentData.setMapFlag= mapFlag;
-
-        DialogData.ActionData.QuestFlag questFlag = new DialogData.ActionData.QuestFlag();
-        questFlag.key = questFlagName.getText();
-        questFlag.val = (int)questFlagValue.getModel().getValue();
-        currentData.setQuestFlag= questFlag;
-
-        currentData.issueQuest = issueQuest.getText();
-        currentData.advanceMapFlag= advanceMapFlag.getText();
-        currentData.advanceQuestFlag= advanceQuestFlag.getText();
-        currentData.advanceCharacterFlag= advanceCharacterFlag.getText();
-        currentData.battleWithActorID= Integer.parseInt(battleWithActorID.getText());
-        currentData.activateMapObject= Integer.parseInt((activateObjectID.getText()));
-        currentData.deleteMapObject= Integer.parseInt(deleteMapObject.getText());
-        currentData.setColorIdentity= setColorIdentity.getText();
-        currentData.addLife= (int) addLife.getModel().getValue();
-        currentData.addMapReputation= (int)addReputation.getModel().getValue();
-        currentData.POIReference= POIReference.getText();
-        currentData.removeItem= removeItem.getText();
-
-        //These need a dedicated effect editor
-//        JTextField setEffect = new JTextField();
-//        JTextField giveBlessing = new JTextField();
-//        currentData.giveBlessing= giveBlessing.getText();
-//        currentData.setEffect= setEffect.getText();
-
-        //These are valid pre-existing fields, but should be handled through the dedicated rewards editor
-//        currentData.addGold =;
-//        currentData.addItem=;
-//        currentData.grantRewards =;
-
-        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
-        if (listeners != null && listeners.length > 0) {
-            ChangeEvent evt = new ChangeEvent(this);
-            for (ChangeListener listener : listeners) {
-                listener.stateChanged(evt);
-            }
-        }
-
-    }
-    public void addChangeListener(ChangeListener l) {
-        listenerList.add(ChangeListener.class, l);
-    }
-    public void setCurrentAction(DialogData.ActionData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-
-        mapFlagName.setText(currentData.setMapFlag==null?"":currentData.setMapFlag.key);
-        mapFlagValue.getModel().setValue(currentData.setMapFlag==null?0:currentData.setMapFlag.val);
-
-        questFlagName.setText(currentData.setQuestFlag==null?"":currentData.setQuestFlag.key);
-        questFlagValue.getModel().setValue(currentData.setQuestFlag==null?0:currentData.setQuestFlag.val);
-
-        issueQuest.setText(currentData.issueQuest);
-        advanceMapFlag.setText(currentData.advanceMapFlag);
-        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));
-        setColorIdentity.setText(currentData.setColorIdentity);
-        addLife.getModel().setValue(currentData.addLife);
-        addReputation.getModel().setValue(currentData.addMapReputation);
-
-        POIReference.setText(currentData.POIReference);
-        removeItem.setText(currentData.removeItem);
-
-        updating=false;
-    }
-}

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/BiomeEdit.java

@@ -1,125 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.BiomeData;
-
-import javax.swing.*;
-
-public class BiomeEdit extends FormPanel {
-    BiomeData currentData;
-
-    public JSpinner startPointX= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JSpinner startPointY= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JSpinner noiseWeight= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JSpinner distWeight= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JTextField name=new JTextField();
-    public FilePicker tilesetAtlas=new FilePicker(new String[]{"atlas"});
-    public JTextField tilesetName=new JTextField();
-    public JSpinner width= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JSpinner height= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JTextField color=new JTextField();
-    public JCheckBox collision=new JCheckBox();
-    public TextListEdit spriteNames =new TextListEdit();
-    public TextListEdit enemies =new TextListEdit();
-    public TextListEdit pointsOfInterest =new TextListEdit();
-
-    public TerrainsEditor terrain =new TerrainsEditor();
-    public StructureEditor structures =new StructureEditor();
-    private boolean updating=false;
-
-    public BiomeEdit()
-    {
-
-        FormPanel center=new FormPanel() {  };
-
-        center.add("startPointX:",startPointX);
-        center.add("startPointY:",startPointY);
-        center.add("noiseWeight:",noiseWeight);
-        center.add("distWeight:",distWeight);
-        center.add("name:",name);
-        center.add("tilesetAtlas:",tilesetAtlas);
-        center.add("tilesetName:",tilesetName);
-        center.add("width:",width);
-        center.add("height:",height);
-        center.add("spriteNames:",spriteNames);
-        center.add("enemies:",enemies);
-        center.add("POITags:",pointsOfInterest);
-        center.add("color:",color);
-        center.add("collision:",collision);
-        center.add("terrain/structures:",new JLabel(""));
-
-        add(center);
-        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));
-        collision.addChangeListener(e -> 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());
-
-
-        startPointX.addChangeListener(e -> BiomeEdit.this.updateTerrain());
-        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));
-        width.addChangeListener(e -> BiomeEdit.this.updateTerrain());
-        height.addChangeListener(e -> BiomeEdit.this.updateTerrain());
-        refresh();
-    }
-
-    protected void updateTerrain() {
-        if(currentData==null||updating)
-            return;
-        currentData.startPointX    = (Float) startPointX.getValue();
-        currentData.startPointY    = (Float) startPointY.getValue();
-        currentData.noiseWeight    = (Float) noiseWeight.getValue();
-        currentData.distWeight      = (Float)distWeight.getValue();
-        currentData.name            = name.getText();
-        currentData.tilesetAtlas    = tilesetAtlas.edit.getText();
-        currentData.tilesetName    = tilesetName.getText();
-        currentData.terrain    = terrain.getBiomeTerrainData();
-        currentData.structures    = structures.getBiomeStructureData();
-        currentData.width    = (Float) width.getValue();
-        currentData.height    = (Float) height.getValue();
-        currentData.color    = color.getText();
-        currentData.collision    = collision.isSelected();
-        currentData.spriteNames    = spriteNames.getList();
-        currentData.enemies    = enemies.getList();
-        currentData.pointsOfInterest    = pointsOfInterest.getList();
-    }
-
-    public void setCurrentBiome(BiomeData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        startPointX.setValue(currentData.startPointX);
-        startPointY.setValue(currentData.startPointY);
-        noiseWeight.setValue(currentData.noiseWeight);
-        distWeight.setValue(currentData.distWeight);
-        name.setText(currentData.name);
-        tilesetAtlas.edit.setText( currentData.tilesetAtlas);
-        tilesetName.setText(currentData.tilesetName);
-        terrain.setTerrains(currentData);
-        structures.setStructures(currentData);
-        width.setValue(currentData.width);
-        height.setValue(currentData.height);
-        color.setText(currentData.color);
-        spriteNames.setText(currentData.spriteNames);
-        enemies.setText(currentData.enemies);
-        collision.setSelected(currentData.collision);
-        pointsOfInterest.setText(currentData.pointsOfInterest);
-        updating=false;
-    }
-}

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

@@ -1,170 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.BiomeStructureData;
-import forge.adventure.util.Config;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionListener;
-
-public class BiomeStructureDataMappingEditor extends JComponent {
-    DefaultListModel<BiomeStructureData.BiomeStructureDataMapping> model = new DefaultListModel<>();
-    JList<BiomeStructureData.BiomeStructureDataMapping> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    BiomeStructureDataMappingEdit edit=new BiomeStructureDataMappingEdit();
-    private BiomeStructureData data;
-
-    public void setCurrent(BiomeStructureData data) {
-        this.data=data;
-        model.clear();
-        if(data==null||data.mappingInfo==null)
-            return;
-        for(int i=0;i<data.mappingInfo.length;i++)
-            model.addElement(data.mappingInfo[i]);
-
-        list.setSelectedIndex(0);
-    }
-
-    public BiomeStructureData.BiomeStructureDataMapping[] getCurrent()
-    {
-        BiomeStructureData.BiomeStructureDataMapping[] array=new BiomeStructureData.BiomeStructureDataMapping[model.size()];
-        for(int i=0;i<array.length;i++)
-            array[i]=model.get(i);
-        return array;
-    }
-
-    public class BiomeStructureDataMappingRenderer extends DefaultListCellRenderer {
-        private final BiomeStructureDataMappingEditor editor;
-
-        public BiomeStructureDataMappingRenderer(BiomeStructureDataMappingEditor biomeStructureDataMappingEditor) {
-            this.editor=biomeStructureDataMappingEditor;
-        }
-
-        @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 BiomeStructureData.BiomeStructureDataMapping biomeData))
-                return label;
-            // Get the renderer component from parent class
-
-            label.setText(biomeData.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));
-                else
-                {
-                    ImageIcon img=itemAtlas.getAny();
-                    if(img!=null)
-                        label.setIcon(img);
-                }
-            }
-
-            return label;
-        }
-    }
-    public void addButton(String name, ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-    public BiomeStructureDataMappingEditor()
-    {
-
-        list.setCellRenderer(new BiomeStructureDataMappingEditor.BiomeStructureDataMappingRenderer(this));
-        list.addListSelectionListener(e -> BiomeStructureDataMappingEditor.this.updateEdit());
-        addButton("add", e -> BiomeStructureDataMappingEditor.this.add());
-        addButton("remove", e -> BiomeStructureDataMappingEditor.this.remove());
-        addButton("copy", e -> BiomeStructureDataMappingEditor.this.copy());
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        add(new JScrollPane(list), BorderLayout.WEST);
-        add(toolBar, BorderLayout.NORTH);
-        add(edit,BorderLayout.CENTER);
-    }
-    private void copy() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        BiomeStructureData.BiomeStructureDataMapping data=new BiomeStructureData.BiomeStructureDataMapping(model.get(selected));
-        model.add(model.size(),data);
-    }
-    private void updateEdit() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrent(model.get(selected));
-    }
-
-    void add()
-    {
-        BiomeStructureData.BiomeStructureDataMapping data=new BiomeStructureData.BiomeStructureDataMapping();
-        data.name="Structure "+model.getSize();
-        model.add(model.size(),data);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-    }
-
-    private class BiomeStructureDataMappingEdit extends FormPanel{
-        BiomeStructureData.BiomeStructureDataMapping currentData;
-
-
-        public JTextField name=new JTextField();
-        public JTextField color=new JTextField();
-        public JCheckBox collision=new JCheckBox();
-        private boolean updating=false;
-
-        public BiomeStructureDataMappingEdit()
-        {
-
-
-            add("name:",name);
-            add("color:",color);
-            add("collision:",collision);
-
-            name.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureDataMappingEdit.this::update));
-            color.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureDataMappingEdit.this::update));
-            collision.addChangeListener(e -> BiomeStructureDataMappingEdit.this.update());
-            refresh();
-        }
-
-        private void update() {
-            if(currentData==null||updating)
-                return;
-            currentData.name        = name.getText();
-            currentData.color       = color.getText();
-            currentData.collision   = collision.isSelected();
-        }
-
-        public void setCurrent(BiomeStructureData.BiomeStructureDataMapping data)
-        {
-            currentData=data;
-            refresh();
-        }
-
-        private void refresh() {
-            setEnabled(currentData!=null);
-            if(currentData==null)
-            {
-                return;
-            }
-            updating=true;
-            name.setText(currentData.name);
-            color.setText(currentData.color);
-            collision.setSelected(currentData.collision);
-            updating=false;
-        }
-    }
-}

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

@@ -1,136 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.BiomeData;
-import forge.adventure.data.BiomeStructureData;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-public class BiomeStructureEdit extends FormPanel {
-    private boolean updating=false;
-    BiomeStructureData currentData;
-    BiomeData currentBiomeData;
-    public JTextField structureAtlasPath=new JTextField();
-    public FloatSpinner x= new FloatSpinner();
-    public FloatSpinner y= new FloatSpinner();
-    public FloatSpinner width= new FloatSpinner();
-    public FloatSpinner height= new FloatSpinner();
-    public JCheckBox randomPosition=new JCheckBox();
-    public IntSpinner N= new IntSpinner();
-    public JTextField sourcePath= new JTextField();
-    public JTextField maskPath= new JTextField();
-    public JCheckBox periodicInput= new JCheckBox();
-    public IntSpinner ground= new IntSpinner();
-    public IntSpinner symmetry= new IntSpinner();
-    public JCheckBox periodicOutput= new JCheckBox();
-    public BiomeStructureDataMappingEditor data=new BiomeStructureDataMappingEditor();
-    public BiomeStructureEdit()
-    {
-        FormPanel center=new FormPanel();
-
-        center.add("structureAtlasPath:",structureAtlasPath);
-        center.add("x:",x);
-        center.add("y:",y);
-        center.add("width:",width);
-        center.add("height:",height);
-        center.add("N:",N);
-        center.add("sourcePath:",sourcePath);
-        center.add("maskPath:",maskPath);
-        center.add("periodicInput:",periodicInput);
-        center.add("ground:",ground);
-        center.add("symmetry:",symmetry);
-        center.add("periodicOutput:",periodicOutput);
-
-        add(center);
-        add(data);
-
-        structureAtlasPath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
-
-
-        x.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        y.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        width.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        height.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        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));
-        periodicInput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        periodicOutput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
-        refresh();
-    }
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            data.setCurrent(null);
-            return;
-        }
-        updating=true;
-        structureAtlasPath.setText(currentData.structureAtlasPath);
-        x.setValue(currentData.x);
-        y.setValue(currentData.y);
-        width.setValue(currentData.width);
-        height.setValue(currentData.height);
-        randomPosition.setSelected(currentData.randomPosition);
-        N.setValue(currentData.N);
-        sourcePath.setText(currentData.sourcePath);
-        maskPath.setText(currentData.maskPath);
-        periodicInput.setSelected(currentData.periodicInput);
-        ground.setValue(currentData.ground);
-        symmetry.setValue(currentData.symmetry);
-        periodicOutput.setSelected(currentData.periodicOutput);
-
-        data.setCurrent(currentData);
-
-
-
-        updating=false;
-    }
-    public void updateStructure()
-    {
-
-        if(currentData==null||updating)
-            return;
-        currentData.structureAtlasPath=structureAtlasPath.getText();
-
-        currentData.x= x.floatValue();
-        currentData.y= y.floatValue();
-        currentData.width= width.floatValue();
-        currentData.height= height.floatValue();
-        currentData.randomPosition=randomPosition.isSelected();
-        currentData.mappingInfo= data.getCurrent();
-
-        currentData.N= N.intValue();
-        currentData.sourcePath= sourcePath.getText();
-        currentData.maskPath= maskPath.getText();
-        currentData.periodicInput= periodicInput.isSelected();
-        currentData.ground= ground.intValue();
-        currentData.symmetry= symmetry.intValue();
-        currentData.periodicOutput= periodicOutput.isSelected();
-        emitChanged();
-    }
-    public void setCurrentStructure(BiomeStructureData biomeTerrainData, BiomeData data) {
-        currentData =biomeTerrainData;
-        currentBiomeData=data;
-        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);
-            }
-        }
-    }
-
-}

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

@@ -1,84 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.BiomeData;
-import forge.adventure.data.BiomeTerrainData;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-public class BiomeTerrainEdit extends FormPanel {
-    SwingAtlasPreview preview=new SwingAtlasPreview(128);
-    private boolean updating=false;
-    BiomeTerrainData currentData;
-    BiomeData currentBiomeData;
-    public JTextField spriteName=new JTextField();
-    public JSpinner min= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JSpinner max= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JSpinner resolution= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-
-    public BiomeTerrainEdit()
-    {
-        FormPanel center=new FormPanel() {  };
-
-        center.add("spriteName:",spriteName);
-        center.add("min:",min);
-        center.add("max:",max);
-        center.add("resolution:",resolution);
-        add(center,preview);
-
-        spriteName.getDocument().addDocumentListener(new DocumentChangeListener(BiomeTerrainEdit.this::updateTerrain));
-
-        min.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());
-        max.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());
-        resolution.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());
-
-
-        refresh();
-    }
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        spriteName.setText(currentData.spriteName);
-        min.setValue(currentData.min);
-        max.setValue(currentData.max);
-        resolution.setValue(currentData.resolution);
-        if(currentBiomeData!=null&&currentData!= null)
-            preview.setSpritePath(currentBiomeData.tilesetAtlas,currentData.spriteName);
-        updating=false;
-    }
-    public void updateTerrain()
-    {
-
-        if(currentData==null||updating)
-            return;
-        currentData.spriteName=spriteName.getText();
-        currentData.min= (float) min.getValue();
-        currentData.max= (float) max.getValue();
-        currentData.resolution= (float) resolution.getValue();
-        preview.setSpritePath(currentBiomeData.tilesetAtlas,currentData.spriteName);
-        emitChanged();
-    }
-    public void setCurrentTerrain(BiomeTerrainData biomeTerrainData, BiomeData data) {
-        currentData =biomeTerrainData;
-        currentBiomeData=data;
-        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);
-            }
-        }
-    }
-}

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

@@ -1,155 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.DialogData;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.*;
-
-public class DialogEdit extends FormPanel {
-    private boolean updating=false;
-    DialogData currentData;
-
-    public JTextField name=new JTextField(80);
-    public JTextField text=new JTextField(80);
-    public JTextField locname=new JTextField(80);
-    public JTextField loctext=new JTextField(80);
-
-    JPanel namePanel;
-    JPanel locNamePanel;
-
-    public JButton addNode = new JButton("Add node");
-    public JButton removeNode = new JButton("Remove node");
-
-    public DialogEdit()
-    {
-        FormPanel center=new FormPanel() {  };
-
-        name.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(DocumentEvent e) {
-                if (!updating)
-                    emitChanged();
-            }
-
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                if (!updating)
-                    emitChanged();
-            }
-
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-                if (!updating)
-                    emitChanged();
-            }
-        });
-
-        text.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(DocumentEvent e) {
-               if (!updating)
-                    emitChanged();
-            }
-
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                if (!updating)
-                    emitChanged();
-            }
-
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-                if (!updating)
-                    emitChanged();
-            }
-        });
-
-
-        JPanel editData = new JPanel();
-        editData.setLayout(new BoxLayout(editData, BoxLayout.Y_AXIS));
-
-        namePanel = new JPanel();
-        namePanel.setLayout(new FlowLayout());
-        namePanel.add(new JLabel("Name:"));
-        namePanel.add(name);
-        editData.add(namePanel);
-
-        JPanel textPanel = new JPanel();
-        textPanel.setLayout(new FlowLayout());
-        textPanel.add(new JLabel("Text:"));
-        textPanel.add(text);
-        editData.add(textPanel);
-
-        JPanel buttonPanel = new JPanel();
-        buttonPanel.setLayout(new FlowLayout());
-        buttonPanel.add(addNode);
-        buttonPanel.add(removeNode);
-        editData.add(buttonPanel);
-
-        editData.add(new JLabel("localization tokens for translation"));
-
-        locNamePanel = new JPanel();
-        locNamePanel.setLayout(new FlowLayout());
-        locNamePanel.add(new JLabel("Name Token:"));
-        locNamePanel.add(locname);
-
-
-        JPanel locTextPanel = new JPanel();
-        locTextPanel.setLayout(new FlowLayout());
-        locTextPanel.add(new JLabel("Text Token:"));
-        locTextPanel.add(loctext);
-
-        editData.add(locNamePanel);
-        editData.add(locTextPanel);
-        center.add(editData);
-
-        add(center);
-
-        refresh();
-    }
-
-    public void refresh(){
-        refresh(false);
-    }
-
-    public void refresh(boolean onRootNode) {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        name.setText(currentData.name);
-        locname.setText(currentData.locname);
-        text.setText(currentData.text);
-
-        loctext.setText(currentData.loctext);
-
-        namePanel.setVisible(!onRootNode);
-        locNamePanel.setVisible(!onRootNode);
-
-
-
-
-
-        updating=false;
-    }
-
-    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);
-            }
-        }
-    }
-}

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

@@ -1,242 +0,0 @@
-package forge.adventure.editor;
-
-import com.google.common.collect.ObjectArrays;
-import forge.adventure.data.DialogData;
-import forge.adventure.data.RewardData;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class DialogEditor extends JComponent{
-
-    private boolean updating = false;
-    private java.util.List<DialogData> allNodes = new ArrayList<>();
-
-    public JTextArea text =new JTextArea("(Initial dialog text)", 3, 80);
-    public RewardsEditor rewardsEditor = new RewardsEditor();
-    public ActionEditor actionEditor = new ActionEditor();
-    public DialogOptionEditor optionEditor = new DialogOptionEditor();
-    public DialogTree navTree = new DialogTree();
-
-    public DialogEdit edit = new DialogEdit();
-
-    private DialogData root = new DialogData();
-    private DialogData current = new DialogData();
-
-    public DialogEditor(){
-        buildUI();
-
-        navTree.addSelectionListener(q -> loadNewNodeSelection());
-        edit.addChangeListener(q-> acceptEdits());
-        edit.addNode.addActionListener(q -> addNode());
-        edit.removeNode.addActionListener(q -> removeNode());
-    }
-
-    public void loadData(DialogData rootDialogData){
-        updating = true;
-        if (rootDialogData == null)
-        {
-            rootDialogData = new DialogData();
-        }
-        root = rootDialogData;
-        navTree.loadDialog(rootDialogData);
-        text.setText(rootDialogData.text);
-
-        updating = false;
-    }
-
-    public DialogData getDialogData(){
-
-        return root;
-    }
-
-    JTabbedPane tabs = new JTabbedPane();
-    JToolBar conditionsToolbar = new JToolBar("conditionsToolbar");
-    JToolBar actionsToolbar = new JToolBar("actionsToolbar");
-    JToolBar optionsToolbar = new JToolBar("optionsToolbar");
-    JToolBar tokensToolbar = new JToolBar("tokensToolbar");
-
-    JPanel conditionsPanel = new JPanel();
-    JPanel actionsPanel = new JPanel();
-    JPanel optionsPanel = new JPanel();
-    JPanel rewardsPanel = new JPanel();
-    JPanel tokensPanel = new JPanel();
-
-    class QuestTextDocumentListener implements DocumentListener {
-        public void changedUpdate(DocumentEvent e) {
-            root.text = text.getText();
-            emitChanged();
-        }
-        public void removeUpdate(DocumentEvent e) {
-            root.text = text.getText();
-            emitChanged();
-        }
-        public void insertUpdate(DocumentEvent e) {
-            root.text = text.getText();
-            emitChanged();
-        }
-    }
-
-    public void buildUI(){
-        buildTabs();
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        JPanel textArea = new JPanel();
-        textArea.setLayout(new FlowLayout());
-        textArea.add(new JLabel("Dialog Start"));
-        textArea.add(text);
-        text.getDocument().addDocumentListener(new QuestTextDocumentListener());
-
-        JSplitPane splitPane = new JSplitPane();
-        splitPane.setLeftComponent(navTree);
-        splitPane.setRightComponent(tabs);
-        splitPane.setResizeWeight(0.2);
-        splitPane.setDividerLocation(.2);
-
-        add(textArea, BorderLayout.NORTH);
-        add(splitPane, BorderLayout.CENTER);
-    }
-
-    public void loadNewNodeSelection(){
-        updating = true;
-        current = navTree.getSelectedData();
-        edit.currentData = navTree.getSelectedData();
-        edit.refresh(root.equals(current));
-        rewardsEditor.clear();
-        actionEditor.clear();
-        if (navTree.getSelectedData() != null) {
-            for (DialogData.ActionData action : navTree.getSelectedData().action) {
-                if (action.grantRewards != null && action.grantRewards.length > 0)
-                    rewardsEditor.setRewards(action.grantRewards);
-            }
-            actionEditor.setAction(navTree.getSelectedData().action);
-        }
-        updating = false;
-    }
-
-    public void acceptEdits(){
-        if (current == null)
-            return;
-        current.name = edit.name.getText();
-        current.text = edit.text.getText();
-        current.locname = edit.locname.getText();
-        current.loctext = edit.loctext.getText();
-        root.text = text.getText();
-
-        DialogData.ActionData[] action = actionEditor.getAction();
-
-        ArrayList<DialogData.ActionData> actionsList = new ArrayList<>(Arrays.stream(action).collect(Collectors.toList()));
-
-        RewardData[] rewards= rewardsEditor.getRewards();
-        if (rewards.length > 0)
-        {
-            DialogData.ActionData rewardAction = new DialogData.ActionData();
-            rewardAction.grantRewards = rewards;
-            actionsList.add(rewardAction);
-        }
-
-        current.action = actionsList.toArray(current.action);
-
-        navTree.replaceCurrent();
-        emitChanged();
-    }
-
-    public void addNode(){
-        DialogData newNode = new DialogData();
-        newNode.name = "NewResponse";
-        DialogData parent = navTree.getSelectedData()!=null?navTree.getSelectedData():root;
-        parent.options = ObjectArrays.concat(parent.options, newNode);
-        navTree.loadDialog(root);
-        navTree.setSelectedData(newNode);
-        emitChanged();
-    }
-    public void removeNode(){
-        if (navTree.getSelectedData() == null)
-            return;
-        navTree.removeSelectedData();
-        emitChanged();
-    }
-
-    public void buildTabs(){
-        buildToolBars();
-
-        actionsPanel.add(actionsToolbar);
-        actionsPanel.add(actionEditor);
-        optionsPanel.add(edit);
-        rewardsPanel.add(rewardsEditor);
-        rewardsEditor.addChangeListener(e -> DialogEditor.this.acceptEdits());
-        actionEditor.addChangeListener(e -> DialogEditor.this.acceptEdits());
-        tokensPanel.add(tokensToolbar);
-        tokensPanel.add(new JLabel("Insert token editor here"));
-
-        tabs.addTab("Options", optionsPanel);
-        tabs.addTab("Conditions", conditionsPanel);
-        tabs.addTab("Actions", actionsPanel);
-        tabs.addTab("Rewards", rewardsPanel);
-        tabs.addTab("Tokens",tokensPanel);
-    }
-
-    public void buildToolBars(){
-        conditionsToolbar.setFloatable(false);
-        actionsToolbar.setFloatable(false);
-        optionsToolbar.setFloatable(false);
-
-        JButton addOption = new JButton("Add Option");
-        addOption.addActionListener(e -> DialogEditor.this.addOption());
-        optionsToolbar.add(addOption);
-
-        JButton copyOption = new JButton("Copy Selected");
-        copyOption.addActionListener(e -> DialogEditor.this.copyOption());
-        optionsToolbar.add(copyOption);
-
-        JButton removeOption = new JButton("Remove Selected");
-        removeOption.addActionListener(e -> DialogEditor.this.removeOption());
-        optionsToolbar.add(removeOption);
-
-    }
-        public void addOption(){
-        optionEditor.addOption();
-            emitChanged();
-    }
-
-    public void copyOption(){
-        emitChanged();
-    }
-
-    public void removeOption(){
-        int selected=optionEditor.list.getSelectedIndex();
-        if(selected<0)
-            return;
-        optionEditor.model.remove(selected);
-        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);
-            }
-        }
-    }
-
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-
-}

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

@@ -1,85 +0,0 @@
-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.*;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class DialogOptionEdit extends FormPanel {
-    DialogData currentData;
-
-    JLabel nameLabel = new JLabel("Name (Player dialog / action)");
-    JLabel textLabel = new JLabel("Text (Game response to Name - Leave blank to end dialog)");
-    JTextArea text =new JTextArea(3,80);
-    JTextArea name =new JTextArea(3,80);
-    JButton add = new JButton();
-    JButton load = new JButton();
-
-    private boolean updating=false;
-
-    public DialogOptionEdit()
-    {
-        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-
-        JPanel upper = new JPanel();
-        upper.setLayout(new BorderLayout());
-
-        upper.add(nameLabel, BorderLayout.NORTH);
-        upper.add(name, BorderLayout.CENTER);
-        add(upper);
-
-        JPanel middle = new JPanel();
-        middle.setLayout(new BorderLayout());
-        middle.add(textLabel, BorderLayout.NORTH);
-        middle.add(text, BorderLayout.CENTER);
-
-        add(middle);
-
-        name.getDocument().addDocumentListener(new DocumentChangeListener(DialogOptionEdit.this::updateDialog));
-        text.getDocument().addDocumentListener(new DocumentChangeListener(DialogOptionEdit.this::updateDialog));
-
-
-    }
-
-    private void updateDialog() {
-        if(currentData==null||updating)
-            return;
-
-        currentData.text = text.getText().trim();
-        currentData.name = name.getText().trim();
-
-        //currentData.condition = conditionEditor.getConditions();
-
-        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
-        if (listeners != null && listeners.length > 0) {
-            ChangeEvent evt = new ChangeEvent(this);
-            for (ChangeListener listener : listeners) {
-                listener.stateChanged(evt);
-            }
-        }
-
-    }
-    public void addChangeListener(ChangeListener l) {
-        listenerList.add(ChangeListener.class, l);
-    }
-    public void setCurrentOption(DialogData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        updating=true;
-
-        text.setText(currentData.text!=null?currentData.text:"");
-        name.setText(currentData.name!=null?currentData.name:"");
-
-        updating=false;
-    }
-}

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

@@ -1,138 +0,0 @@
-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 DialogOptionEditor extends JComponent{
-    DefaultListModel<DialogData> model = new DefaultListModel<>();
-    JList<DialogData> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    DialogOptionEdit edit=new DialogOptionEdit();
-
-
-
-    public class DialogDataRenderer 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 dialog))
-                return label;
-            StringBuilder builder=new StringBuilder();
-            if(dialog.name==null||dialog.name.isEmpty())
-                builder.append("[[Blank Option]]");
-            else
-                builder.append(dialog.name, 0, Math.min(dialog.name.length(), 25));
-            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 DialogOptionEditor()
-    {
-
-        list.setCellRenderer(new DialogDataRenderer());
-        list.addListSelectionListener(e -> DialogOptionEditor.this.updateEdit());
-        addButton("add", e -> DialogOptionEditor.this.addOption());
-        addButton("remove", e -> DialogOptionEditor.this.remove());
-        addButton("copy", e -> DialogOptionEditor.this.copy());
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        add(list, BorderLayout.LINE_START);
-        add(toolBar, BorderLayout.PAGE_START);
-        toolBar.setFloatable(false);
-        add(edit,BorderLayout.CENTER);
-        edit.setVisible(false);
-
-        edit.addChangeListener(e -> emitChanged());
-    }
-    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 copy() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        DialogData data=new DialogData(model.get(selected));
-        model.add(model.size(),data);
-    }
-
-    private void updateEdit() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            edit.setCurrentOption(new DialogData());
-        else
-            edit.setCurrentOption(model.get(selected));
-    }
-
-    void addOption()
-    {
-        DialogData data=new DialogData();
-        model.add(model.size(),data);
-        edit.setVisible(true);
-        list.setSelectedIndex(model.size() - 1);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-        edit.setVisible(model.size() > 0);
-    }
-    public void setOptions(DialogData[] options) {
-        model.clear();
-        if(options==null || options.length == 0)
-            options = new DialogData[0];
-        for (int i=0;i<options.length;i++) {
-            model.add(i,options[i]);
-        }
-        if (model.size() > 0)
-        {
-            edit.setVisible(true);
-            list.setSelectedIndex(0);
-            updateEdit();
-        }
-        else{
-            edit.setVisible(false);
-        }
-    }
-
-    public DialogData[] getOptions() {
-        DialogData[] options= new DialogData[model.getSize()];
-        for(int i=0;i<model.getSize();i++)
-        {
-            options[i]=model.get(i);
-        }
-        return options;
-    }
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-
-}

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

@@ -1,116 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.DialogData;
-
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class DialogTree extends JPanel {
-    private JTree dialogTree;
-    private JScrollPane scrollPane;
-
-
-    public DialogTree(){
-        setLayout(new BorderLayout());
-        // Create the JTree component
-        dialogTree = new JTree();
-        dialogTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
-        addSelectionListener();
-        // Create a scroll pane to contain the JTree
-        scrollPane = new JScrollPane(dialogTree);
-        // Add the scroll pane to the panel
-        add(scrollPane, BorderLayout.CENTER);
-    }
-
-    public void loadDialog(DialogData dialogData){
-//        rootNode = buildBranches(dialogData);
-//        ((DefaultTreeModel)dialogTree.getModel()).setRoot(rootNode);
-        ((DefaultTreeModel)dialogTree.getModel()).setRoot(buildBranches(dialogData));
-    }
-
-    public DefaultMutableTreeNode buildBranches(DialogData dialogData)
-    {
-        DefaultMutableTreeNode node = new DefaultMutableTreeNode(dialogData);
-        for (DialogData option : dialogData.options){
-            node.add(buildBranches(option));
-        }
-        return node;
-    }
-
-    private final List<TreeSelectionListener> selectionListeners = new ArrayList<>();
-
-    public void addSelectionListener(){
-        //subscribe to valueChanged, change to that object in edit pane
-        dialogTree.getSelectionModel().addTreeSelectionListener(this::emitChanged);
-
-    }
-
-    public void addSelectionListener(final TreeSelectionListener listener) {
-        selectionListeners.remove(listener); //ensure listener not added multiple times
-        selectionListeners.add(listener);
-    }
-
-    protected void emitChanged(TreeSelectionEvent evt) {
-        if (selectionListeners != null && selectionListeners.size() > 0) {
-            for (TreeSelectionListener listener : selectionListeners) {
-                listener.valueChanged(evt);
-            }
-        }
-    }
-
-    public void replaceCurrent(){
-        if (dialogTree.getSelectionPath() == null || dialogTree.getSelectionPath().getLastPathComponent() == null)
-            return;
-        dialogTree.updateUI();
-    }
-
-    public DialogData getSelectedData() {
-        DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) dialogTree.getLastSelectedPathComponent();
-        if (selectedNode != null) {
-            return (DialogData) selectedNode.getUserObject();
-        }
-        return null;
-    }
-
-    public void removeSelectedData() {
-        //Todo: Enhance this to not collapse any nodes (after setSelectedData other paths are still collapsed)
-        DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) dialogTree.getLastSelectedPathComponent();
-
-        DialogData parentData = (DialogData) ((DefaultMutableTreeNode)selectedNode.getParent()).getUserObject();
-        parentData.options = Arrays.stream(parentData.options).filter(q -> q != selectedNode.getUserObject()).toArray(DialogData[]::new);
-       ((DefaultTreeModel) dialogTree.getModel()).removeNodeFromParent(selectedNode);
-        ((DefaultTreeModel) dialogTree.getModel()).reload();
-
-        setSelectedData(parentData);
-    }
-    public void setSelectedData(DialogData data) {
-        // Find the node with the given data object and select it in the tree
-        DefaultMutableTreeNode node = findNode((DefaultMutableTreeNode)dialogTree.getModel().getRoot(), data);
-        if (node != null) {
-            dialogTree.setSelectionPath(new TreePath(node.getPath()));
-        }
-    }
-
-    private DefaultMutableTreeNode findNode(DefaultMutableTreeNode parent, DialogData data) {
-        // Search for the node with the given data object in the subtree rooted at the parent node
-        if (parent.getUserObject() == data) {
-            return parent;
-        }
-        for (int i = 0; i < parent.getChildCount(); i++) {
-            DefaultMutableTreeNode child = (DefaultMutableTreeNode) parent.getChildAt(i);
-            DefaultMutableTreeNode result = findNode(child, data);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-}

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/EnemyEdit.java

@@ -1,337 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.EnemyData;
-
-import javax.swing.*;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Enumeration;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class EnemyEdit extends FormPanel {
-    EnemyData currentData;
-    JTextField nameField=new JTextField();
-    JTextField nameOverride=new JTextField();
-    JTextField colorField=new JTextField();
-    JTextField ai=new JTextField();
-    JCheckBox flying=new JCheckBox();
-    JCheckBox boss=new JCheckBox();
-    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"});
-    FilePicker atlas=new FilePicker(new String[]{"atlas"});
-    JTextField equipment=new JTextField();
-    RewardsEditor rewards=new RewardsEditor();
-    SwingAtlasPreview preview=new SwingAtlasPreview();
-    JTextField manualEntry = new JTextField(20);
-    private boolean updating=false;
-
-    DefaultListModel<String> existingModel = new DefaultListModel<>();
-    DefaultListModel<String> enemyModel = new DefaultListModel<>();
-    JList<String> existingTags;
-    JList<String> enemyTags;
-
-    public EnemyEdit()
-    {
-        setLayout(new BorderLayout());
-        FormPanel top=new FormPanel() {  };
-        add(top, BorderLayout.NORTH);
-
-        JTabbedPane tabs = new JTabbedPane();
-        add(tabs, BorderLayout.CENTER);
-        FormPanel basicInfo=new FormPanel() {  };
-        tabs.addTab("Basic Info", basicInfo);
-
-        top.add("Name:",nameField);
-        top.add("Display Name:", nameOverride);
-
-        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);
-        basicInfo.add("Equipment:",equipment);
-        basicInfo.add("Colors:",colorField);
-
-        basicInfo.add("ai:",ai);
-        basicInfo.add("flying:",flying);
-        basicInfo.add("boss:",boss);
-
-        JPanel visual = new JPanel();
-
-        visual.add("Sprite:",atlas);
-        visual.add(preview);
-
-        JPanel tags = new JPanel();
-        existingTags = new JList<>();
-
-
-        existingTags.getInputMap(JList.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke("ENTER"), "addSelected");
-        existingTags.getActionMap().put("addSelected", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                addSelected();
-
-                int index = existingTags.getSelectedIndex();
-
-                String selectedItem = existingTags.getSelectedValue();
-
-                if (selectedItem != null) {
-                    enemyModel.addElement(selectedItem);
-                    existingTags.grabFocus();
-                    existingTags.setSelectedIndex(index<existingModel.size()?index:index-1);
-
-                }
-            }
-        });
-
-
-
-        existingModel = QuestController.getInstance().getEnemyTags();
-        existingTags.setModel(existingModel);
-
-
-
-
-        enemyTags = new JList<>();
-        enemyModel = new DefaultListModel<>();
-        enemyTags.setModel(enemyModel);
-
-        enemyTags.getModel().addListDataListener(new ListDataListener() {
-                                           @Override
-                                           public void intervalAdded(ListDataEvent e) {
-                                               doUpdate();
-                                           }
-
-                                           @Override
-                                           public void intervalRemoved(ListDataEvent e) {
-                                               doUpdate();
-                                           }
-
-                                           @Override
-                                           public void contentsChanged(ListDataEvent e) {
-                                               doUpdate();
-                                           }
-                                       });
-
-        JButton select = new JButton("Select");
-        select.addActionListener(q -> addSelected());
-        JButton add = new JButton("Manual Add");
-        add.addActionListener(q -> manualAdd(enemyModel));
-        JButton remove = new JButton("Remove Item");
-        remove.addActionListener(q -> removeSelected());
-
-        tags.setLayout(new BorderLayout());
-
-        JPanel left = new JPanel();
-        left.setLayout(new BorderLayout());
-        left.add(new JLabel("Tags already in use"), BorderLayout.NORTH);
-        JScrollPane listScroller = new JScrollPane(existingTags);
-        listScroller.setMinimumSize(new Dimension(400, 800));
-        left.add(listScroller, BorderLayout.CENTER);
-        tags.add(left, BorderLayout.WEST);
-
-        FormPanel tagEdit = new FormPanel();
-        tagEdit.setLayout(new BorderLayout());
-
-        FormPanel mappedTags = new FormPanel();
-        mappedTags.setLayout(new BorderLayout());
-        mappedTags.add(new JLabel("Tags Mapped to this object"), BorderLayout.NORTH);
-        JScrollPane listScroller2 = new JScrollPane(enemyTags);
-        listScroller2.setMinimumSize(new Dimension(400, 800));
-        mappedTags.add(listScroller2, BorderLayout.CENTER);
-        tagEdit.add(mappedTags,BorderLayout.EAST);
-
-        JPanel controlPanel = new JPanel();
-
-        controlPanel.add(select);
-        controlPanel.add(add);
-        controlPanel.add(manualEntry);
-
-        manualEntry.getInputMap(JList.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke("ENTER"), "addTyped");
-        manualEntry.getActionMap().put("addTyped", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (!manualEntry.getText().trim().isEmpty()) {
-                    manualAdd(enemyModel);
-                    manualEntry.grabFocus();
-                }
-            }
-        });
-
-
-        controlPanel.add(remove);
-        tagEdit.add(controlPanel, BorderLayout.CENTER);
-        tags.add(tagEdit,BorderLayout.CENTER);
-
-        JTextArea right1 = new JTextArea("This is really just to pad some space\n" +
-                                        "but also to explain the use of tags.\n" +
-                                        "Rather than adding 100's of object names\n" +
-                                        "to every quest definition, instead we will\n"+
-                                        "categorize enemies and points of interest with\n"+
-                                        "tags and reference those categories in quests");
-        right1.setEnabled(false);
-        tags.add(right1, BorderLayout.EAST);
-        tabs.addTab("Sprite", visual);
-        tabs.addTab("Rewards", rewards);
-        tabs.addTab("Quest Tags", tags);
-
-
-        equipment.getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
-        atlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
-        colorField.getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
-        ai.getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
-        flying.addChangeListener(e -> EnemyEdit.this.updateEnemy());
-        boss.addChangeListener(e -> EnemyEdit.this.updateEnemy());
-        ignoreDungeonEffect.addChangeListener(e -> EnemyEdit.this.updateEnemy());
-        nameField.getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
-        nameOverride.getDocument().addDocumentListener(new DocumentChangeListener(EnemyEdit.this::updateEnemy));
-        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());
-        lifeFiled.addChangeListener(e -> EnemyEdit.this.updateEnemy());
-        enemyModel.addListDataListener(new ListDataListener() {
-            @Override
-            public void intervalAdded(ListDataEvent e) {
-                EnemyEdit.this.updateEnemy();
-            }
-
-            @Override
-            public void intervalRemoved(ListDataEvent e) {
-                EnemyEdit.this.updateEnemy();
-            }
-
-            @Override
-            public void contentsChanged(ListDataEvent e) {
-                EnemyEdit.this.updateEnemy();
-            }
-        });
-        refresh();
-    }
-
-
-    private void doUpdate(){
-        EnemyEdit.this.updateEnemy();
-    }
-
-    private void addSelected(){
-        if (existingTags.getSelectedIndex()>-1)
-            enemyModel.addElement(existingTags.getModel().getElementAt(existingTags.getSelectedIndex()));
-        doUpdate();
-    }
-
-    private void removeSelected(){
-        if (enemyTags.getSelectedIndex()>-1)
-            enemyModel.remove(enemyTags.getSelectedIndex());
-        doUpdate();
-    }
-
-    private void filterExisting(DefaultListModel<String> filter){
-        DefaultListModel<String> toReturn = new DefaultListModel<>();
-        for (Enumeration<String> e = QuestController.getInstance().getEnemyTags().elements(); e.hasMoreElements();){
-            String toTest = e.nextElement();
-            if (toTest != null & !filter.contains(toTest)){
-                toReturn.addElement(toTest);
-            }
-        }
-        existingTags.setModel(toReturn);
-    }
-
-    private void manualAdd(DefaultListModel<String> model){
-        if (!manualEntry.getText().trim().isEmpty())
-            model.addElement(manualEntry.getText().trim());
-        manualEntry.setText("");
-        doUpdate();
-    }
-
-    public void updateEnemy() {
-        if(currentData==null||updating)
-            return;
-        currentData.name=nameField.getText();
-        currentData.colors=colorField.getText();
-        currentData.ai=ai.getText();
-        currentData.flying=flying.isSelected();
-        currentData.boss=boss.isSelected();
-        currentData.life= (int) lifeFiled.getValue();
-        currentData.sprite= atlas.getEdit().getText();
-        if(equipment.getText().isEmpty())
-            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.deck= deck.getEdit().getText().split(",");
-        currentData.rewards= rewards.getRewards();
-        preview.setSpritePath(currentData.sprite);
-
-        ArrayList<String> tags = new ArrayList<>();
-        for (Enumeration<String> e = enemyModel.elements(); e.hasMoreElements();){
-            tags.add(e.nextElement());
-        }
-
-        tags.removeIf(String::isEmpty);
-        currentData.questTags = tags.toArray(currentData.questTags);
-        QuestController.getInstance().refresh();
-        filterExisting(enemyModel);
-    }
-
-    public void setCurrentEnemy(EnemyData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        nameField.setText(currentData.name);
-        colorField.setText(currentData.colors);
-        ai.setText(currentData.ai);
-        boss.setSelected(currentData.boss);
-        flying.setSelected(currentData.flying);
-        lifeFiled.setValue(currentData.life);
-        atlas.getEdit().setText(currentData.sprite);
-        if(currentData.equipment!=null)
-            equipment.setText(String.join(",",currentData.equipment));
-        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);
-        rewards.setRewards(currentData.rewards);
-        preview.setSpritePath(currentData.sprite);
-        enemyModel.clear();
-        for(String val : currentData.questTags) {
-            if (val != null)
-                enemyModel.addElement(val);
-        }
-        filterExisting(enemyModel);
-        updating=false;
-    }
-}

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

@@ -1,132 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonWriter;
-import forge.adventure.data.EnemyData;
-import forge.adventure.util.Config;
-import forge.adventure.util.Paths;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionListener;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class EnemyEditor extends JComponent {
-    DefaultListModel<EnemyData> model = new DefaultListModel<>();
-    JList<EnemyData> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    EnemyEdit edit=new EnemyEdit();
-
-
-
-    public class EnemyDataRenderer 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 EnemyData))
-                return label;
-            EnemyData enemy=(EnemyData) value;
-            // Get the renderer component from parent class
-
-            label.setText(enemy.name);
-            SwingAtlas atlas=new SwingAtlas(Config.instance().getFile(enemy.sprite));
-            if(atlas.has("Avatar"))
-                label.setIcon(atlas.get("Avatar"));
-            else
-            {
-                ImageIcon img=atlas.getAny();
-                if(img!=null)
-                    label.setIcon(img);
-            }
-            return label;
-        }
-    }
-    public void addButton(String name,ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-    public EnemyEditor()
-    {
-
-        list.setCellRenderer(new EnemyDataRenderer());
-        list.addListSelectionListener(e -> EnemyEditor.this.updateEdit());
-        addButton("add", e -> EnemyEditor.this.addEnemy());
-        addButton("remove", e -> EnemyEditor.this.remove());
-        addButton("copy", e -> EnemyEditor.this.copy());
-        addButton("load", e -> {
-            EnemyEditor.this.load();
-            QuestController.getInstance().load();
-        });
-        addButton("save", e -> EnemyEditor.this.save());
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        add(new JScrollPane(list), BorderLayout.LINE_START);
-        toolBar.setFloatable(false);
-        add(toolBar, BorderLayout.PAGE_START);
-        add(edit,BorderLayout.CENTER);
-        load();
-    }
-    private void copy() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        EnemyData data=new EnemyData(model.get(selected));
-        model.add(model.size(),data);
-    }
-    private void updateEdit() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrentEnemy(model.get(selected));
-        edit.updateEnemy();
-    }
-
-    void save()
-    {
-        Array<EnemyData> allEnemies=new Array<>();
-        for(int i=0;i<model.getSize();i++)
-            allEnemies.add(model.get(i));
-        Json json = new Json(JsonWriter.OutputType.json);
-        FileHandle handle = Config.instance().getFile(Paths.ENEMIES);
-        handle.writeString(json.prettyPrint(json.toJson(allEnemies,Array.class, EnemyData.class)),false);
-
-    }
-    void load()
-    {
-        model.clear();
-        Array<EnemyData> allEnemies=new Array<>();
-        Json json = new Json();
-        FileHandle handle = Config.instance().getFile(Paths.ENEMIES);
-        if (handle.exists())
-        {
-            allEnemies = json.fromJson(Array.class, EnemyData.class, handle);
-        }
-        for (int i=0;i<allEnemies.size;i++) {
-            model.add(i,allEnemies.get(i));
-        }
-    }
-    void addEnemy()
-    {
-        EnemyData data=new EnemyData();
-        data.name="Enemy "+model.getSize();
-        model.add(model.size(),data);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-    }
-}

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

@@ -1,19 +0,0 @@
-package forge.adventure.editor;
-
-import javax.swing.*;
-
-public class FloatSpinner extends JSpinner{
-
-    public FloatSpinner()
-    {
-        this( 0.f, 1f, 0.1f);
-    }
-    public FloatSpinner(float min,float max,float stepSize)
-    {
-        super(new SpinnerNumberModel(new Float(0.0f), new Float(min), new Float (max), new Float(stepSize)));
-    }
-    public float floatValue()
-    {
-        return (Float) getValue();
-    }
-}

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

@@ -1,63 +0,0 @@
-package forge.adventure.editor;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class FormPanel extends JPanel {
-    int row=0;
-    static final int MAXIMUM_LINES=300;
-    public FormPanel()
-    {
-        setLayout(new GridBagLayout()) ;
-
-
-        GridBagConstraints constraint=new GridBagConstraints();
-        constraint.weightx = 1.0;
-        constraint.weighty = 1.0;
-        constraint.gridy=MAXIMUM_LINES;
-        constraint.gridx=0;
-        constraint.gridwidth=2;
-        add(Box.createVerticalGlue(),constraint);
-        row++;
-    }
-    public void add(JComponent name,JComponent element)
-    {
-        GridBagConstraints constraint=new GridBagConstraints();
-        constraint.ipadx = 5;
-        constraint.ipady = 5;
-        constraint.weightx = 1.0;
-        constraint.weighty = 0.0;
-        constraint.gridy=row;
-        constraint.gridx=0;
-        constraint.anchor=GridBagConstraints.NORTHWEST;
-        add(name,constraint);
-        constraint.gridy=row;
-        constraint.gridx=1;
-        constraint.fill=GridBagConstraints.HORIZONTAL;
-        constraint.anchor=GridBagConstraints.NORTHEAST;
-        add(element,constraint);
-
-        row++;
-    }
-    public void add(String name,JComponent element)
-    {
-        add(new JLabel(name),element);
-    }
-    public void add(JComponent element)
-    {
-        GridBagConstraints constraint=new GridBagConstraints();
-        constraint.ipadx = 5;
-        constraint.ipady = 5;
-        constraint.weightx = 1.0;
-        constraint.weighty = 0.0;
-        constraint.gridy=row;
-        constraint.gridx=0;
-        constraint.gridwidth=2;
-        constraint.fill=GridBagConstraints.HORIZONTAL;
-        constraint.anchor=GridBagConstraints.NORTHEAST;
-        add(element,constraint);
-
-        row++;
-    }
-
-}

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

@@ -1,20 +0,0 @@
-package forge.adventure.editor;
-
-import javax.swing.*;
-
-
-public class IntSpinner extends JSpinner {
-
-    public IntSpinner()
-    {
-        this( 0, 100, 1);
-    }
-    public IntSpinner(int min,int max,int stepSize)
-    {
-        super(new SpinnerNumberModel(new Integer(0), new Integer(min), new Integer (max), new Integer(stepSize)));
-    }
-    public int intValue()
-    {
-        return (Integer) getValue();
-    }
-}

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

@@ -1,86 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.ItemData;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class ItemEdit extends JComponent {
-    ItemData currentData;
-    JTextField nameField=new JTextField();
-    JTextField equipmentSlot=new JTextField();
-    JTextField iconName=new JTextField();
-    EffectEditor effect=new EffectEditor(false);
-    JTextField description=new JTextField();
-    JCheckBox questItem=new JCheckBox();
-    JSpinner cost= new JSpinner(new SpinnerNumberModel(0, 0, 100000, 1));
-
-    private boolean updating=false;
-
-    public ItemEdit()
-    {
-
-        setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
-        FormPanel parameters=new FormPanel();
-        parameters.setBorder(BorderFactory.createTitledBorder("Parameter"));
-
-        parameters.add("Name:",nameField);
-        parameters.add("equipmentSlot:",equipmentSlot);
-        parameters.add("description:",description);
-        parameters.add("iconName",iconName);
-        parameters.add("questItem",questItem);
-        parameters.add("cost",cost);
-
-        add(parameters);
-        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));
-        cost.addChangeListener(e -> ItemEdit.this.updateItem());
-        questItem.addChangeListener(e -> ItemEdit.this.updateItem());
-        effect.addChangeListener(e -> ItemEdit.this.updateItem());
-        refresh();
-    }
-
-    private void updateItem() {
-        if(currentData==null||updating)
-            return;
-        currentData.name=nameField.getText();
-        currentData.equipmentSlot=  equipmentSlot.getText();
-        currentData.effect= effect.getCurrentEffect();
-        currentData.description=description.getText();
-        currentData.iconName=iconName.getText();
-        currentData.questItem=questItem.isSelected();
-        currentData.cost= (Integer) cost.getValue();
-    }
-
-    public void setCurrentItem(ItemData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        nameField.setText(currentData.name);
-        effect.setCurrentEffect(currentData.effect);
-        equipmentSlot.setText(currentData.equipmentSlot);
-        description.setText(currentData.description);
-        iconName.setText(currentData.iconName);
-        questItem.setSelected(currentData.questItem);
-        cost.setValue(currentData.cost);
-
-        updating=false;
-    }
-}

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

@@ -1,274 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.PointOfInterestData;
-
-import javax.swing.*;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Enumeration;
-
-public class PointOfInterestEdit extends JComponent {
-
-    PointOfInterestData currentData;
-
-
-    JTextField  name        = new JTextField();
-    JTextField  type        = new JTextField();
-    JSpinner    count       = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
-    FilePicker  spriteAtlas = new FilePicker(new String[]{"atlas"});
-    JTextField  sprite      = new JTextField();
-    FilePicker  map         = new FilePicker(new String[]{"tmx"});
-    JSpinner    radiusFactor= new JSpinner(new SpinnerNumberModel(0.0f, 0.0f, 2.0f, 0.1f));
-    SwingAtlasPreview preview=new SwingAtlasPreview(256,2000);
-
-    JTextField manualEntry = new JTextField(20);
-    DefaultListModel<String> existingModel = new DefaultListModel<>();
-    DefaultListModel<String> POIModel = new DefaultListModel<>();
-    JList<String> existingTags;
-    JList<String> POITags;
-
-    private boolean updating=false;
-
-    public PointOfInterestEdit()
-    {
-        JTabbedPane tabs = new JTabbedPane();
-        add(tabs, BorderLayout.CENTER);
-
-        setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
-        FormPanel parameters=new FormPanel();
-        //parameters.setLayout(new BoxLayout(parameters, BoxLayout.Y_AXIS));
-        parameters.setBorder(BorderFactory.createTitledBorder("Parameter"));
-
-        JPanel tags = new JPanel();
-
-        tabs.addTab("Basic Info", parameters);
-        tabs.addTab("Quest Tags", tags);
-
-        parameters.add("Name:",name);
-        parameters.add("Type:",type);
-        parameters.add("Count:",count);
-        parameters.add("Sprite atlas:",spriteAtlas);
-        parameters.add("Sprite:",sprite);
-        parameters.add("Map:",map);
-        parameters.add("Radius factor:",radiusFactor);
-        parameters.add(preview);
-
-        name.getDocument().addDocumentListener(new DocumentChangeListener(PointOfInterestEdit.this::updateItem));
-        type.getDocument().addDocumentListener(new DocumentChangeListener(PointOfInterestEdit.this::updateItem));
-        count.addChangeListener(e -> PointOfInterestEdit.this.updateItem());
-        spriteAtlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(PointOfInterestEdit.this::updateItem));
-        sprite.getDocument().addDocumentListener(new DocumentChangeListener(PointOfInterestEdit.this::updateItem));
-        map.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(PointOfInterestEdit.this::updateItem));
-        radiusFactor.addChangeListener(e -> PointOfInterestEdit.this.updateItem());
-
-
-
-        existingTags = new JList<>();
-
-
-        existingTags.getInputMap(JList.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke("ENTER"), "addSelected");
-        existingTags.getActionMap().put("addSelected", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int index = existingTags.getSelectedIndex();
-
-                String selectedItem = existingTags.getSelectedValue();
-
-                if (selectedItem != null) {
-                    POIModel.addElement(selectedItem);
-                    existingTags.grabFocus();
-                    existingTags.setSelectedIndex(index<existingModel.size()?index:index-1);
-
-                }
-            }
-        });
-
-
-
-        existingModel = QuestController.getInstance().getPOITags();
-        existingTags.setModel(existingModel);
-
-
-
-
-        POITags = new JList<>();
-        POIModel = new DefaultListModel<>();
-        POITags.setModel(POIModel);
-
-        POITags.getModel().addListDataListener(new ListDataListener() {
-            @Override
-            public void intervalAdded(ListDataEvent e) {
-                updateItem();
-            }
-
-            @Override
-            public void intervalRemoved(ListDataEvent e) {
-                updateItem();
-            }
-
-            @Override
-            public void contentsChanged(ListDataEvent e) {
-                updateItem();
-            }
-        });
-
-        JButton select = new JButton("Select");
-        select.addActionListener(q -> addSelected());
-        JButton add = new JButton("Manual Add");
-        add.addActionListener(q -> manualAdd(POIModel));
-        JButton remove = new JButton("Remove Item");
-        remove.addActionListener(q -> removeSelected());
-
-        tags.setLayout(new BorderLayout());
-
-        JPanel left = new JPanel();
-        left.setLayout(new BorderLayout());
-        left.add(new JLabel("Tags already in use"), BorderLayout.NORTH);
-        JScrollPane listScroller = new JScrollPane(existingTags);
-        listScroller.setMinimumSize(new Dimension(400, 800));
-        left.add(listScroller, BorderLayout.CENTER);
-        tags.add(left, BorderLayout.WEST);
-
-        FormPanel tagEdit = new FormPanel();
-        tagEdit.setLayout(new BorderLayout());
-
-        FormPanel mappedTags = new FormPanel();
-        mappedTags.setLayout(new BorderLayout());
-        mappedTags.add(new JLabel("Tags Mapped to this object"), BorderLayout.NORTH);
-        JScrollPane listScroller2 = new JScrollPane(POITags);
-        listScroller2.setMinimumSize(new Dimension(400, 800));
-        mappedTags.add(listScroller2, BorderLayout.CENTER);
-        tagEdit.add(mappedTags,BorderLayout.EAST);
-
-        JPanel controlPanel = new JPanel();
-
-        controlPanel.add(select);
-        controlPanel.add(add);
-        controlPanel.add(manualEntry);
-
-        manualEntry.getInputMap(JList.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke("ENTER"), "addTyped");
-        manualEntry.getActionMap().put("addTyped", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-
-                if (!manualEntry.getText().trim().isEmpty()) {
-                    manualAdd(POIModel);
-                    manualEntry.grabFocus();
-                }
-            }
-        });
-
-
-        controlPanel.add(remove);
-        tagEdit.add(controlPanel, BorderLayout.CENTER);
-        tags.add(tagEdit,BorderLayout.CENTER);
-
-        JTextArea right1 = new JTextArea("This is really just to pad some space\n" +
-                "but also to explain the use of tags.\n" +
-                "Rather than adding 100's of object names\n" +
-                "to every quest definition, instead we will\n"+
-                "categorize enemies and points of interest with\n"+
-                "tags and reference those categories in quests");
-        right1.setEnabled(false);
-        tags.add(right1, BorderLayout.EAST);
-
-
-
-
-
-
-
-
-
-        refresh();
-    }
-
-    private void updateItem() {
-        if(currentData==null||updating)
-            return;
-        currentData.name=name.getText();
-        currentData.type=  type.getText();
-        currentData.count= (Integer) count.getValue();
-        currentData.spriteAtlas=spriteAtlas.getEdit().getText();
-        currentData.sprite=sprite.getText();
-        currentData.map=map.getEdit().getText();
-        currentData.radiusFactor= (Float) radiusFactor.getValue();
-
-        ArrayList<String> tags = new ArrayList<>();
-        for (Enumeration<String> e = POIModel.elements(); e.hasMoreElements();){
-            tags.add(e.nextElement());
-        }
-
-        currentData.questTags = tags.toArray(currentData.questTags);
-        QuestController.getInstance().refresh();
-        filterExisting(POIModel);
-    }
-
-    public void setCurrent(PointOfInterestData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void addSelected(){
-        if (existingTags.getSelectedIndex()>-1)
-            POIModel.addElement(existingTags.getModel().getElementAt(existingTags.getSelectedIndex()));
-        updateItem();
-    }
-
-    private void removeSelected(){
-        if (POITags.getSelectedIndex()>-1)
-            POIModel.remove(POITags.getSelectedIndex());
-        updateItem();
-    }
-
-    private void filterExisting(DefaultListModel<String> filter){
-        DefaultListModel<String> toReturn = new DefaultListModel<>();
-        for (Enumeration<String> e = QuestController.getInstance().getPOITags().elements(); e.hasMoreElements();){
-            String toTest = e.nextElement();
-            if (toTest != null & !filter.contains(toTest)){
-                toReturn.addElement(toTest);
-            }
-        }
-        existingTags.setModel(toReturn);
-    }
-
-    private void manualAdd(DefaultListModel<String> model){
-        if (!manualEntry.getText().trim().isEmpty())
-            model.addElement(manualEntry.getText().trim());
-        manualEntry.setText("");
-        updateItem();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        name.setText(currentData.name);
-        type.setText(currentData.type);
-        count.setValue(currentData.count);
-        spriteAtlas.getEdit().setText(currentData.spriteAtlas);
-        sprite.setText(currentData.sprite);
-        map.getEdit().setText(currentData.map);
-        radiusFactor.setValue(currentData.radiusFactor);
-
-        preview.setSpritePath(currentData.spriteAtlas,currentData.sprite);
-        POIModel.clear();
-        for(String val : currentData.questTags) {
-            if (val != null)
-                POIModel.addElement(val);
-        }
-        filterExisting(POIModel);
-        updating=false;
-    }
-}

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

@@ -1,134 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonWriter;
-import forge.adventure.data.PointOfInterestData;
-import forge.adventure.util.Config;
-import forge.adventure.util.Paths;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.util.HashMap;
-
-public class PointOfInterestEditor extends JComponent {
-    DefaultListModel<PointOfInterestData> model = new DefaultListModel<>();
-    JList<PointOfInterestData> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    PointOfInterestEdit edit=new PointOfInterestEdit();
-
-    static HashMap<String,SwingAtlas> atlas=new HashMap<>();
-
-
-
-    public static class PointOfInterestRenderer 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 PointOfInterestData))
-                return label;
-            PointOfInterestData poi=(PointOfInterestData) value;
-            // Get the renderer component from parent class
-
-            label.setText(poi.name);
-            if(!atlas.containsKey(poi.spriteAtlas))
-                atlas.put(poi.spriteAtlas,new SwingAtlas(Config.instance().getFile(poi.spriteAtlas)));
-
-            SwingAtlas poiAtlas = atlas.get(poi.spriteAtlas);
-
-            if(poiAtlas.has(poi.sprite))
-                label.setIcon(poiAtlas.get(poi.sprite));
-            else
-            {
-                ImageIcon img=poiAtlas.getAny();
-                if(img!=null)
-                    label.setIcon(img);
-            }
-            return label;
-        }
-    }
-    public void addButton(String name, ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-    public PointOfInterestEditor()
-    {
-
-        list.setCellRenderer(new PointOfInterestEditor.PointOfInterestRenderer());
-        list.addListSelectionListener(e -> PointOfInterestEditor.this.updateEdit());
-        addButton("add", e -> PointOfInterestEditor.this.addItem());
-        addButton("remove", e -> PointOfInterestEditor.this.remove());
-        addButton("copy", e -> PointOfInterestEditor.this.copy());
-        addButton("load", e -> PointOfInterestEditor.this.load());
-        addButton("save", e -> PointOfInterestEditor.this.save());
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        add(new JScrollPane(list), BorderLayout.LINE_START);
-        toolBar.setFloatable(false);
-        add(toolBar, BorderLayout.PAGE_START);
-        add(edit,BorderLayout.CENTER);
-        load();
-    }
-    private void copy() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        PointOfInterestData data=new PointOfInterestData(model.get(selected));
-        model.add(model.size(),data);
-    }
-    private void updateEdit() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrent(model.get(selected));
-    }
-
-    void save()
-    {
-        Array<PointOfInterestData> allEnemies=new Array<>();
-        for(int i=0;i<model.getSize();i++)
-            allEnemies.add(model.get(i));
-        Json json = new Json(JsonWriter.OutputType.json);
-        FileHandle handle = Config.instance().getFile(Paths.POINTS_OF_INTEREST);
-        handle.writeString(json.prettyPrint(json.toJson(allEnemies,Array.class, PointOfInterestData.class)),false);
-
-    }
-    void load()
-    {
-        model.clear();
-        Array<PointOfInterestData> allEnemies=new Array<>();
-        Json json = new Json();
-        FileHandle handle = Config.instance().getFile(Paths.POINTS_OF_INTEREST);
-        if (handle.exists())
-        {
-            allEnemies =json.fromJson(Array.class, PointOfInterestData.class, handle);
-        }
-        for (int i=0;i<allEnemies.size;i++) {
-            model.add(i,allEnemies.get(i));
-        }
-
-        QuestController.getInstance().load();
-    }
-    void addItem()
-    {
-        PointOfInterestData data=new PointOfInterestData();
-        data.name="PoI "+model.getSize();
-        model.add(model.size(),data);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-    }
-}

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

@@ -1,236 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonWriter;
-import forge.adventure.data.AdventureQuestData;
-import forge.adventure.data.EnemyData;
-import forge.adventure.data.PointOfInterestData;
-import forge.adventure.util.Config;
-import forge.adventure.util.Paths;
-
-import javax.swing.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class QuestController {
-
-    public final DefaultListModel<String> POITags = new DefaultListModel<>();
-    public final DefaultListModel<String> enemyTags = new DefaultListModel<>();
-    public final DefaultListModel<String> questEnemyTags = new DefaultListModel<>();
-    public final DefaultListModel<String> questTags = new DefaultListModel<>();
-    public final DefaultListModel<String> questPOITags = new DefaultListModel<>();
-    private final DefaultListModel<PointOfInterestData> allPOI = new DefaultListModel<>();
-    private final DefaultListModel<EnemyData> allEnemies = new DefaultListModel<>();
-    private final DefaultListModel<String> questSourceTags = new DefaultListModel<>();
-
-    private final DefaultListModel<AdventureQuestData> allQuests = new DefaultListModel<>();
-
-    private static QuestController instance;
-
-    public static QuestController getInstance() {
-        if (instance == null)
-            instance = new QuestController();
-        return instance;
-    }
-
-    public DefaultListModel<AdventureQuestData> getAllQuests() {
-            return allQuests;
-    }
-
-    private QuestController(){
-        load();
-    }
-
-    public DefaultListModel<String> getEnemyTags(){
-        DefaultListModel<String> toReturn = new DefaultListModel<>();
-        for (int i = 0; i < enemyTags.size(); i++){
-            toReturn.removeElement(enemyTags.get(i));
-            toReturn.addElement(enemyTags.get(i));
-        }
-
-        List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList());
-
-        toReturn.clear();
-
-        for (Object sortedObject : sortedObjects) {
-            toReturn.addElement((String) sortedObject);
-        }
-
-        return toReturn;
-    }
-
-    public DefaultListModel<String> getPOITags(){
-        DefaultListModel<String> toReturn = new DefaultListModel<>();
-        for (int i = 0; i < POITags.size(); i++){
-            toReturn.removeElement(POITags.get(i));
-            toReturn.addElement(POITags.get(i));
-        }
-
-        List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList());
-
-        toReturn.clear();
-
-        for (Object sortedObject : sortedObjects) {
-            toReturn.addElement((String) sortedObject);
-        }
-
-        return toReturn;
-    }
-
-    public DefaultListModel<String> getSourceTags(){
-        DefaultListModel<String> toReturn = new DefaultListModel<>();
-
-        for (int i = 0; i < questSourceTags.size(); i++)
-        {
-            toReturn.removeElement(questSourceTags.get(i));
-            toReturn.addElement(questSourceTags.get(i));
-        }
-
-        List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList());
-
-        toReturn.clear();
-
-        for (Object sortedObject : sortedObjects) {
-            toReturn.addElement((String) sortedObject);
-        }
-
-        return toReturn;
-    }
-
-    public void refresh(){
-        enemyTags.clear();
-        POITags.clear();
-        questPOITags.clear();
-        questEnemyTags.clear();
-        questTags.clear();
-        questSourceTags.clear();
-
-        for (int i=0;i<allEnemies.size();i++) {
-            for (String tag : allEnemies.get(i).questTags)
-            {
-                enemyTags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    enemyTags.addElement(tag);
-            }
-        }
-
-        for (int i=0;i<allPOI.size();i++) {
-            for (String tag : allPOI.get(i).questTags)
-            {
-                POITags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    POITags.addElement(tag);
-            }
-        }
-
-        for (int i=0;i<allQuests.size();i++) {
-
-            for (String tag : allQuests.get(i).questEnemyTags)
-            {
-                questEnemyTags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    questEnemyTags.addElement(tag);
-            }
-            for (String tag : allQuests.get(i).questPOITags)
-            {
-                questPOITags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    questPOITags.addElement(tag);
-            }
-
-            for (String tag : allQuests.get(i).questSourceTags)
-            {
-                questSourceTags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    questSourceTags.addElement(tag);
-            }
-
-        }
-    }
-
-    public void load()
-    {
-        allEnemies.clear();
-        Array<EnemyData> enemyJSON=new Array<>();
-        Json json = new Json();
-        FileHandle handle = Config.instance().getFile(Paths.ENEMIES);
-        if (handle.exists())
-        {
-            enemyJSON = json.fromJson(Array.class, EnemyData.class, handle);
-        }
-        for (int i=0;i<enemyJSON.size;i++) {
-            allEnemies.add(i,enemyJSON.get(i));
-            for (String tag : enemyJSON.get(i).questTags)
-            {
-                enemyTags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    enemyTags.addElement(tag);
-            }
-        }
-
-        allPOI.clear();
-        Array<PointOfInterestData> POIJSON=new Array<>();
-        json = new Json();
-        handle = Config.instance().getFile(Paths.POINTS_OF_INTEREST);
-        if (handle.exists())
-        {
-            POIJSON = json.fromJson(Array.class, PointOfInterestData.class, handle);
-        }
-        for (int i=0;i<POIJSON.size;i++) {
-            allPOI.add(i,POIJSON.get(i));
-            for (String tag : POIJSON.get(i).questTags)
-            {
-                POITags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    POITags.addElement(tag);
-            }
-        }
-
-        allQuests.clear();
-        Array<AdventureQuestData> questJSON=new Array<>();
-        json = new Json();
-        handle = Config.instance().getFile(Paths.QUESTS);
-        if (handle.exists())
-        {
-            questJSON = json.fromJson(Array.class, AdventureQuestData.class, handle);
-        }
-        for (int i=0;i<questJSON.size;i++) {
-            AdventureQuestData template = questJSON.get(i);
-            template.isTemplate = true;
-
-            allQuests.add(i,template);
-
-            for (String tag : template.questEnemyTags)
-            {
-                questEnemyTags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    questEnemyTags.addElement(tag);
-            }
-            for (String tag : template.questPOITags)
-            {
-                questPOITags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    questPOITags.addElement(tag);
-            }
-            for (String tag : template.questSourceTags)
-            {
-                questSourceTags.removeElement(tag); //Ensure uniqueness
-                if (tag!= null)
-                    questSourceTags.addElement(tag);
-            }
-        }
-    }
-
-    void save()
-    {
-        Json json = new Json(JsonWriter.OutputType.json);
-        FileHandle handle = Config.instance().getFile(Paths.QUESTS);
-        AdventureQuestData[] saveData = Arrays.stream(allQuests.toArray()).map(AdventureQuestData.class::cast).toArray(AdventureQuestData[]::new);
-
-        handle.writeString(json.prettyPrint(json.toJson(saveData,Array.class, AdventureQuestData.class)),false);
-
-    }
-}

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

@@ -1,387 +0,0 @@
-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.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Enumeration;
-
-public class QuestEdit extends FormPanel {
-    AdventureQuestData currentData;
-    //public JSpinner spawnWeight= new JSpinner(new SpinnerNumberModel(0.0f, 0.f, 1f, 0.1f));
-    public JLabel id = new JLabel();
-    public JTextField name=new JTextField();
-    public JTextField description=new JTextField();
-    public JTextField synopsis=new JTextField();
-    public JCheckBox storyQuest = new JCheckBox();
-    public JTextField rewardDescription=new JTextField();
-    public QuestStageEditor stages =new QuestStageEditor();
-
-
-    JTabbedPane tabs =new JTabbedPane();
-    public DialogEditor prologueEditor =new DialogEditor();
-    public DialogEditor epilogueEditor =new DialogEditor();
-    public DialogEditor offerEditor = new DialogEditor();
-    public DialogEditor failureEditor = new DialogEditor();
-    public DialogEditor declineEditor = new DialogEditor();
-    private boolean updating=false;
-
-    JTextField manualEntry = new JTextField(20);
-    DefaultListModel<String> existingModel = new DefaultListModel<>();
-    DefaultListModel<String> selectedTagModel = new DefaultListModel<>();
-    JList<String> existingTags;
-    JList<String> selectedTags;
-    JPanel tags = new JPanel();
-
-    public QuestEdit()
-    {
-
-        FormPanel center=new FormPanel() {  };
-
-        center.add("Quest ID:", id);
-        center.add("Name:",name);
-        //center.add("Synopsis (dev mode):",synopsis);
-        center.add("Description:",description);
-        center.add("Reward Description:",rewardDescription);
-        center.add("Storyline Quest", storyQuest);
-
-        add(center);
-
-        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        add(tabs);
-        tabs.add("Quest Stages", getStagesTab());
-        tabs.add("Offer Dialog",getOfferTab());
-        tabs.add("Prologue",getPrologueTab());
-        tabs.add("Epilogue",getEpilogueTab());
-        tabs.add("Failure Dialog", getFailureTab());
-        tabs.add("Decline Dialog",getDeclineTab());
-        tabs.add("Quest Sources", getSourcesTab());
-
-
-
-        existingTags = new JList<>();
-
-
-        existingTags.getInputMap(JList.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke("ENTER"), "addSelected");
-        existingTags.getActionMap().put("addSelected", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                addSelected();
-
-                int index = existingTags.getSelectedIndex();
-
-                String selectedItem = existingTags.getSelectedValue();
-
-                if (selectedItem != null) {
-                    selectedTagModel.addElement(selectedItem);
-                    existingTags.grabFocus();
-                    existingTags.setSelectedIndex(index<existingModel.size()?index:index-1);
-
-                }
-            }
-        });
-
-
-
-        existingModel = QuestController.getInstance().getSourceTags();
-        existingTags.setModel(existingModel);
-
-
-
-
-        selectedTags = new JList<>();
-        selectedTagModel = new DefaultListModel<>();
-        selectedTags.setModel(selectedTagModel);
-
-        selectedTags.getModel().addListDataListener(new ListDataListener() {
-            @Override
-            public void intervalAdded(ListDataEvent e) {
-                doUpdate();
-            }
-
-            @Override
-            public void intervalRemoved(ListDataEvent e) {
-                doUpdate();
-            }
-
-            @Override
-            public void contentsChanged(ListDataEvent e) {
-                doUpdate();
-            }
-        });
-
-        JButton select = new JButton("Select");
-        select.addActionListener(q -> addSelected());
-        JButton add = new JButton("Manual Add");
-        add.addActionListener(q -> manualAdd(selectedTagModel));
-        JButton remove = new JButton("Remove Item");
-        remove.addActionListener(q -> removeSelected());
-
-        tags.setLayout(new BorderLayout());
-
-        JPanel left = new JPanel();
-        left.setLayout(new BorderLayout());
-        left.add(new JLabel("Tags already in use"), BorderLayout.NORTH);
-        JScrollPane listScroller = new JScrollPane(existingTags);
-        listScroller.setMinimumSize(new Dimension(400, 800));
-        left.add(listScroller, BorderLayout.CENTER);
-        tags.add(left, BorderLayout.WEST);
-
-        FormPanel tagEdit = new FormPanel();
-        tagEdit.setLayout(new BorderLayout());
-
-        FormPanel mappedTags = new FormPanel();
-        mappedTags.setLayout(new BorderLayout());
-        mappedTags.add(new JLabel("Tags Mapped to this object"), BorderLayout.NORTH);
-        JScrollPane listScroller2 = new JScrollPane(selectedTags);
-        listScroller2.setMinimumSize(new Dimension(400, 800));
-        mappedTags.add(listScroller2, BorderLayout.CENTER);
-        tagEdit.add(mappedTags,BorderLayout.EAST);
-
-        JPanel controlPanel = new JPanel();
-
-        controlPanel.add(select);
-        controlPanel.add(add);
-        controlPanel.add(manualEntry);
-
-        manualEntry.getInputMap(JList.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke("ENTER"), "addTyped");
-        manualEntry.getActionMap().put("addTyped", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (!manualEntry.getText().trim().isEmpty()) {
-                    manualAdd(selectedTagModel);
-                    manualEntry.grabFocus();
-                }
-            }
-        });
-
-
-        controlPanel.add(remove);
-        tagEdit.add(controlPanel, BorderLayout.CENTER);
-        tags.add(tagEdit,BorderLayout.CENTER);
-
-        JTextArea right1 = new JTextArea("This is really just to pad some space\n" +
-                "but also to explain the use of tags.\n" +
-                "Rather than adding 100's of object names\n" +
-                "to every quest definition, instead we will\n"+
-                "categorize enemies and points of interest with\n"+
-                "tags and reference those categories in quests");
-        right1.setEnabled(false);
-        tags.add(right1, BorderLayout.EAST);
-
-
-
-        name.getDocument().addDocumentListener(new DocumentChangeListener(QuestEdit.this::updateQuest));
-        description.getDocument().addDocumentListener(new DocumentChangeListener(QuestEdit.this::updateQuest));
-        synopsis.getDocument().addDocumentListener(new DocumentChangeListener(QuestEdit.this::updateQuest));
-        storyQuest.getModel().addChangeListener(q -> QuestEdit.this.updateQuest());
-        rewardDescription.getDocument().addDocumentListener(new DocumentChangeListener(QuestEdit.this::updateQuest));
-        stages.addChangeListener(e -> QuestEdit.this.updateQuest());
-        offerEditor.addChangeListener(e -> QuestEdit.this.updateQuest());
-        prologueEditor.addChangeListener(e -> QuestEdit.this.updateQuest());
-        epilogueEditor.addChangeListener(e -> QuestEdit.this.updateQuest());
-        failureEditor.addChangeListener(e -> QuestEdit.this.updateQuest());
-        declineEditor.addChangeListener(e -> QuestEdit.this.updateQuest());
-        stages.addChangeListener(e -> QuestEdit.this.updateQuest());
-        selectedTagModel.addListDataListener(new ListDataListener() {
-            @Override
-            public void intervalAdded(ListDataEvent e) {
-                QuestEdit.this.updateQuest();
-            }
-
-            @Override
-            public void intervalRemoved(ListDataEvent e) {
-                QuestEdit.this.updateQuest();
-            }
-
-            @Override
-            public void contentsChanged(ListDataEvent e) {
-                QuestEdit.this.updateQuest();
-            }
-        });
-
-        refresh();
-    }
-
-    private void doUpdate(){
-        QuestEdit.this.updateQuest();
-    }
-
-    private void addSelected(){
-        if (existingTags.getSelectedIndex()>-1)
-            selectedTagModel.addElement(existingTags.getModel().getElementAt(existingTags.getSelectedIndex()));
-        doUpdate();
-    }
-
-    private void removeSelected(){
-        if (selectedTags.getSelectedIndex()>-1)
-            selectedTagModel.remove(selectedTags.getSelectedIndex());
-        doUpdate();
-    }
-
-    private void filterExisting(DefaultListModel<String> filter){
-        DefaultListModel<String> toReturn = new DefaultListModel<>();
-        for (Enumeration<String> e = QuestController.getInstance().getSourceTags().elements(); e.hasMoreElements();){
-            String toTest = e.nextElement();
-            if (toTest != null & !filter.contains(toTest)){
-                toReturn.addElement(toTest);
-            }
-        }
-        existingTags.setModel(toReturn);
-    }
-
-    private void manualAdd(DefaultListModel<String> model){
-        if (!manualEntry.getText().trim().isEmpty())
-            model.addElement(manualEntry.getText().trim());
-        manualEntry.setText("");
-        doUpdate();
-    }
-
-    protected void updateQuest() {
-        if(currentData==null||updating)
-            return;
-
-        currentData.name                   = name.getText();
-        currentData.storyQuest             = storyQuest.isSelected();
-        currentData.synopsis               = synopsis.getText();
-        currentData.description            = description.getText();
-        currentData.rewardDescription      = rewardDescription.getText();
-        currentData.stages                 = stages.getStages();
-        currentData.offerDialog            = offerEditor.getDialogData();
-        currentData.prologue               = prologueEditor.getDialogData();
-        currentData.epilogue               = epilogueEditor.getDialogData();
-        currentData.failureDialog          = failureEditor.getDialogData();
-        currentData.declinedDialog         = declineEditor.getDialogData();
-
-        ArrayList<String> tags = new ArrayList<>();
-        for (Enumeration<String> e = selectedTagModel.elements(); e.hasMoreElements();){
-            tags.add(e.nextElement());
-        }
-
-        currentData.questSourceTags = tags.toArray(currentData.questSourceTags);
-        QuestController.getInstance().refresh();
-        filterExisting(selectedTagModel);
-    }
-
-    public void setCurrentQuest(AdventureQuestData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        setVisible(true);
-        updating=true;
-        id.setText(String.valueOf(currentData.getID()));
-        name.setText(currentData.name);
-        description.setText(currentData.description);
-        synopsis.setText(currentData.synopsis);
-        storyQuest.getModel().setSelected(currentData.storyQuest);
-        rewardDescription.setText(currentData.rewardDescription);
-        stages.setStages(currentData);
-
-        offerEditor.loadData(currentData.offerDialog);
-        prologueEditor.loadData(currentData.prologue);
-        epilogueEditor.loadData(currentData.epilogue);
-        failureEditor.loadData(currentData.failureDialog);
-        declineEditor.loadData(currentData.declinedDialog);
-
-        selectedTagModel.clear();
-        for(String val : currentData.questSourceTags) {
-            if (val != null)
-                selectedTagModel.addElement(val);
-        }
-        filterExisting(selectedTagModel);
-
-        updating=false;
-    }
-
-    public JPanel getOfferTab(){
-        JPanel offerTab = new JPanel();
-        offerTab.setLayout(new BoxLayout(offerTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(offerEditor);
-        offerTab.add(center);
-        return offerTab;
-    }
-
-    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;
-    }
-
-    public JPanel getFailureTab(){
-        JPanel failureTab = new JPanel();
-        failureTab.setLayout(new BoxLayout(failureTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(failureEditor);
-        failureTab.add(center);
-        return failureTab;
-    }
-
-    public JPanel getDeclineTab(){
-        JPanel declineTab = new JPanel();
-        declineTab.setLayout(new BoxLayout(declineTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(declineEditor);
-        declineTab.add(center);
-        return declineTab;
-    }
-
-    public JPanel getStagesTab(){
-        JPanel stagesTab = new JPanel();
-        stagesTab.setLayout(new BoxLayout(stagesTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(stages);
-        stagesTab.add(center);
-        return stagesTab;
-    }
-
-    public JPanel getSourcesTab(){
-        JPanel sourcesTab = new JPanel();
-        sourcesTab.setLayout(new BoxLayout(sourcesTab, BoxLayout.Y_AXIS));
-        FormPanel center = new FormPanel();
-        center.add(tags);
-        sourcesTab.add(center);
-        return sourcesTab;
-    }
-}

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

@@ -1,103 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonWriter;
-import forge.adventure.data.AdventureQuestData;
-import forge.adventure.util.Config;
-import forge.adventure.util.Paths;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionListener;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class QuestEditor extends JComponent {
-    JList<AdventureQuestData> list = new JList<>(QuestController.getInstance().getAllQuests());
-    JToolBar toolBar = new JToolBar("toolbar");
-    QuestEdit edit=new QuestEdit();
-
-    public class QuestDataRenderer 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 AdventureQuestData quest))
-                return label;
-            // Get the renderer component from parent class
-
-            label.setText(quest.name);
-            return label;
-        }
-    }
-    public void addButton(String name,ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-    public QuestEditor()
-    {
-
-        list.setCellRenderer(new QuestDataRenderer());
-        list.addListSelectionListener(e -> QuestEditor.this.updateEdit());
-        addButton("Add Quest", e -> QuestEditor.this.addStage());
-        addButton("Remove", e -> QuestEditor.this.remove());
-        addButton("Copy", e -> QuestEditor.this.copy());
-        addButton("Load", e -> QuestController.getInstance().load());
-        addButton("Save", e -> QuestEditor.this.save());
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        add(new JScrollPane(list), BorderLayout.LINE_START);
-        toolBar.setFloatable(false);
-        add(toolBar, BorderLayout.PAGE_START);
-        add(edit,BorderLayout.CENTER);
-        edit.setVisible(false);
-    }
-    private void copy() {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        AdventureQuestData data=new AdventureQuestData(QuestController.getInstance().getAllQuests().get(selected));
-        data.isTemplate = true;
-        QuestController.getInstance().getAllQuests().add(QuestController.getInstance().getAllQuests().size(),data);
-    }
-    private void updateEdit() {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrentQuest(QuestController.getInstance().getAllQuests().get(selected));
-    }
-
-    void save()
-    {
-        Array<AdventureQuestData> allQuests=new Array<>();
-        for(int i=0;i<QuestController.getInstance().getAllQuests().getSize();i++) {
-            allQuests.add(QuestController.getInstance().getAllQuests().get(i));
-        }
-        Json json = new Json(JsonWriter.OutputType.json);
-        FileHandle handle = Config.instance().getFile(Paths.QUESTS);
-        handle.writeString(json.prettyPrint(json.toJson(allQuests,Array.class, AdventureQuestData.class)),false);
-        QuestController.getInstance().save();
-    }
-    void addStage()
-    {
-        AdventureQuestData data=new AdventureQuestData();
-        data.name="New Quest "+QuestController.getInstance().getAllQuests().getSize();
-        data.isTemplate = true;
-        QuestController.getInstance().getAllQuests().add(QuestController.getInstance().getAllQuests().size(),data);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        QuestController.getInstance().getAllQuests().remove(selected);
-        edit.setVisible(false);
-    }
-}

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

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

@@ -1,138 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.AdventureQuestData;
-import forge.adventure.data.AdventureQuestStage;
-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 QuestStageEditor extends JComponent{
-    DefaultListModel<AdventureQuestStage> model = new DefaultListModel<>();
-    JList<AdventureQuestStage> list = new JList<>(model);
-    JScrollPane scroll;
-    JToolBar toolBar = new JToolBar("toolbar");
-    QuestStageEdit edit=new QuestStageEdit();
-
-    AdventureQuestData currentData;
-
-    public class QuestStageRenderer 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 AdventureQuestStage stageData))
-                return label;
-            label.setText(stageData.name);
-            //label.setIcon(new ImageIcon(Config.instance().getFilePath(stageData.sourcePath))); //Type icon eventually?
-            return label;
-        }
-    }
-    public void addButton(String name, ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-
-    public QuestStageEditor()
-    {
-        list.setCellRenderer(new QuestStageRenderer());
-        list.addListSelectionListener(e -> QuestStageEditor.this.updateEdit());
-        addButton("Add Quest Stage", e -> QuestStageEditor.this.addStage());
-        addButton("Remove Selected", e -> QuestStageEditor.this.remove());
-        toolBar.setFloatable(false);
-        setLayout(new BorderLayout());
-        scroll = new JScrollPane(list);
-        add(scroll, BorderLayout.WEST);
-        JPanel editPanel = new JPanel();
-        editPanel.setLayout(new BorderLayout());
-        add(toolBar, BorderLayout.NORTH);
-        editPanel.add(edit,BorderLayout.CENTER);
-        add(editPanel);
-        edit.addChangeListener(e -> emitChanged());
-    }
-
-    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 updateEdit() {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrentStage(model.get(selected),currentData);
-    }
-
-    void addStage()
-    {
-        AdventureQuestStage data=new AdventureQuestStage();
-        data.name = "New Stage";
-        model.add(model.size(),data);
-        edit.setVisible(true);
-        scroll.setVisible(true);
-        int id = 0;
-        for (int i = 0; i < model.size(); i++)
-        {
-            if (model.get(i).id >= id)
-                id = model.get(i).id +1;
-        }
-        data.id = id;
-        if (model.size() == 1){
-            list.setSelectedIndex(0);
-        }
-        emitChanged();
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-        edit.setVisible(false);
-        scroll.setVisible(list.getModel().getSize() > 0);
-        emitChanged();
-    }
-    public void setStages(AdventureQuestData data) {
-
-        currentData=data;
-        model.clear();
-        if(data==null||data.stages==null || data.stages.length == 0)
-        {
-            edit.setVisible(false);
-            return;
-        }
-        for (int i=0;i<data.stages.length;i++) {
-            model.add(i,data.stages[i]);
-        }
-        if (model.size() > 0) {
-            list.setSelectedIndex(0);
-        }
-    }
-
-    public AdventureQuestStage[] getStages() {
-
-        AdventureQuestStage[] stages= new AdventureQuestStage[model.getSize()];
-        for(int i=0;i<model.getSize();i++)
-        {
-            stages[i]=model.get(i);
-        }
-        return stages;
-    }
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-}

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

@@ -1,107 +0,0 @@
-package forge.adventure.editor;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class QuestTagSelector extends JComponent  {
-    DefaultListModel<String> allItems = new DefaultListModel<>();
-    DefaultListModel<String> selectedItems = new DefaultListModel<>();
-    JList<String> unselectedList;
-    JList<String> selectedList;
-
-    boolean useEnemyTags = false;
-    boolean usePOITags = false;
-
-    public QuestTagSelector(String title, boolean useEnemyTags, boolean usePOITags)
-    {
-        if (useEnemyTags){
-            this.useEnemyTags = true;
-        } else if (usePOITags) {
-            this.usePOITags = true;
-        }
-        else{
-            return;
-        }
-
-        unselectedList = new JList<>(allItems);
-        selectedList = new JList<>(selectedItems);
-//        unselectedList.setCellRenderer(new PointOfInterestEditor.PointOfInterestRenderer()); // Replace with use count of tag?
-//        selectedList.setCellRenderer(new PointOfInterestEditor.PointOfInterestRenderer());
-
-        JButton addButton=new JButton("add");
-        JButton removeButton=new JButton("remove");
-        addButton.addActionListener( e -> QuestTagSelector.this.addTag());
-        removeButton.addActionListener( e -> QuestTagSelector.this.removeTag());
-
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        if (title.length() > 0)
-            add(new JLabel(title),BorderLayout.PAGE_START);
-        add(new JScrollPane(unselectedList), BorderLayout.LINE_START);
-        add(new JScrollPane(selectedList), BorderLayout.LINE_END);
-
-        JPanel buttonPanel = new JPanel();
-        GridLayout buttonLayout = new GridLayout(2,0);
-        buttonPanel.setLayout(buttonLayout);
-        buttonPanel.add(addButton);
-        buttonPanel.add(removeButton);
-        add(buttonPanel);
-    }
-
-    public void addTag(){
-        if (unselectedList.isSelectionEmpty()){
-            return;
-        }
-        for (String toAdd : unselectedList.getSelectedValuesList())
-        {
-            if (selectedItems.contains(toAdd)) continue;
-            selectedItems.addElement(toAdd);
-        }
-        refresh();
-    }
-
-    public void removeTag(){
-        if (selectedList.isSelectionEmpty()){
-            return;
-        }
-        for (String toRemove : selectedList.getSelectedValuesList())
-        {
-            selectedItems.removeElement(toRemove);
-        }
-        refresh();
-    }
-
-    public void load(DefaultListModel<String> selectedNames)
-    {
-        allItems.clear();
-        selectedItems.clear();
-
-        if (useEnemyTags){
-            allItems =  QuestController.getInstance().getEnemyTags();
-        }
-        else if (usePOITags) {
-            allItems = QuestController.getInstance().getPOITags();
-        }
-        unselectedList.setModel(allItems);
-        for (int i=0;i<allItems.size();i++){
-            if (selectedNames.contains(allItems.get(i))){
-                selectedItems.addElement(allItems.get(i));
-            }
-        }
-    }
-
-    private boolean updating=false;
-
-    private void refresh() {
-        setEnabled(allItems!=null);
-        if(allItems==null)
-        {
-            return;
-        }
-        updating=true;
-
-        //unselectedList = new JList<>(allItems);
-        //selectedList = new JList<>(selectedItems);
-        updating=false;
-    }
-}

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

@@ -1,144 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.data.RewardData;
-import forge.card.CardType;
-import forge.game.keyword.Keyword;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.util.Arrays;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class RewardEdit extends FormPanel {
-    RewardData currentData;
-
-    JComboBox typeField =new JComboBox(new String[] { "card", "gold", "life", "deckCard", "item","shards"});
-    JSpinner probability = new JSpinner(new SpinnerNumberModel(0f, 0, 1, 0.1f));
-    JSpinner count = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
-    JSpinner addMaxCount = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
-    JTextField cardName =new JTextField();
-    JTextField itemName =new JTextField();
-    TextListEdit editions =new TextListEdit();
-    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 manaCosts =new TextListEdit();
-    TextListEdit keyWords =new TextListEdit(Arrays.stream(Keyword.values()).map(Keyword::toString).toArray(String[]::new));
-    JComboBox colorType =new JComboBox(new String[] { "Any", "Colorless", "MultiColor", "MonoColor"});
-    JTextField cardText =new JTextField();
-    private boolean updating=false;
-
-    public RewardEdit()
-    {
-
-        add("Type:",typeField);
-        add("probability:",probability);
-        add("count:",count);
-        add("addMaxCount:",addMaxCount);
-        add("cardName:",cardName);
-        add("itemName:",itemName);
-        add("editions:",editions);
-        add("colors:",colors);
-        add("rarity:",rarity);
-        add("subTypes:",subTypes);
-        add("cardTypes:",cardTypes);
-        add("superTypes:",superTypes);
-        add("manaCosts:",manaCosts);
-        add("keyWords:",keyWords);
-        add("colorType:",colorType);
-        add("cardText:",cardText);
-
-
-        typeField.addActionListener((e -> RewardEdit.this.updateReward()));
-        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));
-        colorType.addActionListener((e -> RewardEdit.this.updateReward()));
-        cardText.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
-
-    }
-
-    private void updateReward() {
-        if(currentData==null||updating)
-            return;
-
-
-        currentData.type=typeField.getSelectedItem()==null?null:typeField.getSelectedItem().toString();
-        currentData.probability=((Double)probability.getValue()).floatValue();
-        currentData.count= (int) count.getValue();
-        currentData.addMaxCount= (int) addMaxCount.getValue();
-        currentData.cardName = cardName.getText().isEmpty()?null:cardName.getText();
-        currentData.itemNames = itemName.getText().isEmpty()?null:itemName.getText().split(",");
-        currentData.editions = editions.getList();
-        currentData.colors = colors.getList();
-        currentData.rarity = rarity.getList();
-        currentData.subTypes = subTypes.getList();
-        currentData.cardTypes = cardTypes.getList();
-        currentData.superTypes = superTypes.getList();
-        currentData.manaCosts = manaCosts.getListAsInt();
-        currentData.keyWords = keyWords.getList();
-        currentData.colorType=colorType.getSelectedItem()==null?null:colorType.getSelectedItem().toString();
-        currentData.cardText = cardText.getText().isEmpty()?null:cardText.getText();
-
-        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
-        if (listeners != null && listeners.length > 0) {
-            ChangeEvent evt = new ChangeEvent(this);
-            for (ChangeListener listener : listeners) {
-                listener.stateChanged(evt);
-            }
-        }
-
-    }
-    public void addChangeListener(ChangeListener l) {
-        listenerList.add(ChangeListener.class, l);
-    }
-    public void setCurrentReward(RewardData data)
-    {
-        currentData=data;
-        refresh();
-    }
-
-    private void refresh() {
-        setEnabled(currentData!=null);
-        if(currentData==null)
-        {
-            return;
-        }
-        updating=true;
-        typeField.setSelectedItem(currentData.type);
-
-        probability.setValue((double) currentData.probability);
-        count.setValue(currentData.count);
-        addMaxCount.setValue(currentData.addMaxCount);
-        cardName.setText(currentData.cardName);
-        itemName.setText(currentData.itemName);
-        editions.setText(currentData.editions);
-        colors.setText(currentData.colors);
-        rarity.setText(currentData.rarity);
-        subTypes.setText(currentData.subTypes);
-        cardTypes.setText(currentData.cardTypes);
-        superTypes.setText(currentData.superTypes);
-        manaCosts.setText(currentData.manaCosts);
-        keyWords.setText(currentData.keyWords);
-        colorType.setSelectedItem(currentData.colorType);
-        cardText.setText(currentData.cardText);
-
-
-        updating=false;
-    }
-}

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

@@ -1,217 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.graphics.Color;
-import forge.adventure.data.BiomeData;
-import forge.adventure.data.BiomeStructureData;
-import forge.adventure.util.Config;
-import forge.adventure.world.BiomeStructure;
-import forge.adventure.world.ColorMap;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class StructureEditor extends JComponent{
-    DefaultListModel<BiomeStructureData> model = new DefaultListModel<>();
-    JList<BiomeStructureData> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    BiomeStructureEdit edit=new BiomeStructureEdit();
-
-    BiomeData currentData;
-
-    public class StructureDataRenderer 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 BiomeStructureData))
-                return label;
-            BiomeStructureData structureData=(BiomeStructureData) value;
-            label.setText("Structure");
-            label.setIcon(new ImageIcon(Config.instance().getFilePath(structureData.sourcePath)));
-            return label;
-        }
-    }
-    public void addButton(String name, ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-
-    public StructureEditor()
-    {
-
-        list.setCellRenderer(new StructureDataRenderer());
-        list.addListSelectionListener(e -> StructureEditor.this.updateEdit());
-        addButton("add", e -> StructureEditor.this.addStructure());
-        addButton("remove", e -> StructureEditor.this.remove());
-        addButton("copy", e -> StructureEditor.this.copy());
-        addButton("test", e -> StructureEditor.this.test());
-        BorderLayout layout=new BorderLayout();
-        setLayout(layout);
-        add(list, BorderLayout.WEST);
-        add(toolBar, BorderLayout.NORTH);
-        add(edit,BorderLayout.CENTER);
-
-
-        edit.addChangeListener(e -> emitChanged());
-    }
-    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 test() {
-        if (list.isSelectionEmpty())
-            return;
-        long start = System.currentTimeMillis();
-        BiomeStructureData data = model.get(list.getSelectedIndex());
-
-        try
-        {
-
-        BiomeStructure struct = new BiomeStructure(data, System.currentTimeMillis(),
-                (int) (currentData.width * EditorMainWindow.worldEditor.width.intValue() ),
-                (int) (currentData.width * EditorMainWindow.worldEditor.height.intValue()));
-
-            BufferedImage sourceImage= null;
-            try {
-                sourceImage = ImageIO.read(new File(struct.sourceImagePath()));
-            ColorMap sourceColorMap=new ColorMap(sourceImage.getWidth(),sourceImage.getHeight());
-            for(int y=0;y<sourceColorMap.getHeight();y++)
-                for(int x=0;x<sourceColorMap.getWidth();x++)
-                {
-                    Color c =new Color();
-                    Color.argb8888ToColor(c,sourceImage.getRGB(x,y));
-                    sourceColorMap.setColor(x,y,c);
-                }
-
-
-            BufferedImage  maskImage=   ImageIO.read(new File(struct.maskImagePath()));
-            ColorMap maskColorMap=new ColorMap(maskImage.getWidth(),maskImage.getHeight());
-            for(int y=0;y<maskColorMap.getHeight();y++)
-                for(int x=0;x<maskColorMap.getWidth();x++)
-                {
-                    Color c =new Color();
-                    Color.argb8888ToColor(c,maskImage.getRGB(x,y));
-                    maskColorMap.setColor(x,y,c);
-                }
-
-            struct.initialize(sourceColorMap,maskColorMap);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        float calcTime=(System.currentTimeMillis() - start)/1000f;
-
-        JLabel label = new JLabel();
-        ColorMap colorMap=struct.image;
-        BufferedImage image = new BufferedImage(colorMap.getWidth(),colorMap.getHeight(),BufferedImage.TYPE_INT_ARGB);
-
-            for(int y=0;y<colorMap.getHeight();y++)
-                for(int x=0;x<colorMap.getWidth();x++)
-                    image.setRGB(x,y,Color.argb8888(colorMap.getColor(x,y)));
-
-        if (image.getWidth() < 640 | image.getHeight() < 640) {
-            if (image.getHeight() > image.getWidth()) {
-                BufferedImage nimage = new BufferedImage(640, 640 * (image.getWidth() / image.getHeight()), BufferedImage.TYPE_INT_ARGB);
-                AffineTransform at = new AffineTransform();
-                at.scale(640 / image.getHeight(), 640 / image.getHeight());
-                AffineTransformOp scaleOp = new AffineTransformOp(at, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
-                image = scaleOp.filter(image, nimage);
-            } else {
-                BufferedImage nimage = new BufferedImage(640 * (image.getHeight() / image.getWidth()), 640, BufferedImage.TYPE_INT_ARGB);
-                AffineTransform at = new AffineTransform();
-                at.scale(640 / image.getWidth(), 640 / image.getWidth());
-                AffineTransformOp scaleOp = new AffineTransformOp(at, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
-                image = scaleOp.filter(image, nimage);
-            }
-
-        }
-        label.setIcon(new ImageIcon(image));
-        label.setSize(640, 640);
-
-
-
-        JOptionPane.showMessageDialog(this, label,"Calculating took "+ calcTime+" seconds",JOptionPane.PLAIN_MESSAGE);
-        }
-        catch (Exception e)
-        {
-            JOptionPane.showMessageDialog(this, "WaveFunctionCollapse was not successful","can not calculate function "+e.getMessage(),JOptionPane.ERROR_MESSAGE);
-        }
-
-    }
-    private void copy() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        BiomeStructureData data=new BiomeStructureData(model.get(selected));
-        model.add(model.size(),data);
-    }
-
-    private void updateEdit() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrentStructure(model.get(selected),currentData);
-    }
-
-    void addStructure()
-    {
-        BiomeStructureData data=new BiomeStructureData();
-        model.add(model.size(),data);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-    }
-    public void setStructures(BiomeData data) {
-
-        currentData=data;
-        model.clear();
-        if(data==null||data.structures==null)
-        {
-            edit.setCurrentStructure(null,null);
-            return;
-        }
-        for (int i=0;i<data.structures.length;i++) {
-            model.add(i,data.structures[i]);
-        }
-        list.setSelectedIndex(0);
-    }
-
-    public BiomeStructureData[] getBiomeStructureData() {
-
-        BiomeStructureData[] rewards= new BiomeStructureData[model.getSize()];
-        for(int i=0;i<model.getSize();i++)
-        {
-            rewards[i]=model.get(i);
-        }
-        return rewards;
-    }
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-}

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

@@ -1,92 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.utils.Array;
-
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import static java.awt.Image.SCALE_FAST;
-
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class SwingAtlas {
-
-    int imageSize=32;
-    HashMap<String, ArrayList<ImageIcon>> images=new  HashMap<>();
-    public HashMap<String, ArrayList<ImageIcon>> getImages()
-    {
-        return images;
-    }
-    public  SwingAtlas(FileHandle path,int imageSize)
-    {
-        this.imageSize=imageSize;
-        if(!path.exists()||!path.toString().endsWith(".atlas"))
-            return;
-        TextureAtlas.TextureAtlasData data=new TextureAtlas.TextureAtlasData(path,path.parent(),false);
-        for(TextureAtlas.TextureAtlasData.Region region: new Array.ArrayIterator<>(data.getRegions()))
-        {
-             String name=region.name;
-             if(!images.containsKey(name))
-             {
-                 images.put(name,new ArrayList<>());
-             }
-            ArrayList<ImageIcon> imageList=images.get(name);
-            try
-            {
-                imageList.add(spriteToImage(region));
-            }
-            catch (IOException e)
-            {
-                e.printStackTrace();
-            }
-        }
-    }
-    public  SwingAtlas(FileHandle path)
-    {
-        this(path,32);
-    }
-
-    private ImageIcon spriteToImage(TextureAtlas.TextureAtlasData.Region sprite) throws IOException {
-        try
-        {
-            BufferedImage img = ImageIO.read(sprite.page.textureFile.file());
-            if(sprite.width== sprite.height)
-                return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize,imageSize,SCALE_FAST));
-            if(sprite.width>sprite.height)
-                return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(imageSize, (int) (imageSize*(sprite.height/(float)sprite.width)),SCALE_FAST));
-            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)
-        {
-            return null;
-        }
-}
-
-    public ImageIcon get(String name) {
-        if(images.get(name).size()==0)
-            return null;
-        return images.get(name).get(0);
-    }
-
-    public boolean has(String name) {
-        return images.containsKey(name);
-    }
-
-    public ImageIcon getAny() {
-        if(images.isEmpty())
-            return null;
-        ArrayList<ImageIcon> imageList= images.get(images.keySet().iterator().next());
-        if(imageList.isEmpty())
-            return null;
-        return imageList.get(0);
-    }
-}

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

@@ -1,94 +0,0 @@
-package forge.adventure.editor;
-
-import forge.adventure.util.Config;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class SwingAtlasPreview extends Box {
-    int imageSize=32;
-    private String sprite="";
-    private String spriteName="";
-    Timer timer;
-    public SwingAtlasPreview()
-    {
-        this(64,200);
-    }
-    public SwingAtlasPreview(int imageSize,int timeDelay) {
-        super(BoxLayout.Y_AXIS);
-         timer = new Timer(timeDelay, new AbstractAction() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                counter++;
-                for (Pair<JLabel, ArrayList<ImageIcon>> element : labels) {
-                    element.getKey().setIcon(element.getValue().get(counter % element.getValue().size()));
-                }
-            }
-        });
-        this.imageSize=imageSize;
-    }
-    static Map<String,Map<Integer,SwingAtlas>> cache=new HashMap<>();
-    public SwingAtlasPreview(int size) {
-        this();
-        imageSize=size;
-    }
-    int counter=0;
-    List<Pair<JLabel,ArrayList<ImageIcon>>> labels=new ArrayList<>();
-    public void setSpritePath(String sprite) {
-
-        setSpritePath(sprite,null);
-    }
-    public void setSpritePath(String sprite,String name) {
-        if(this.sprite==null||sprite==null||(this.sprite.equals(sprite)&&(spriteName != null && spriteName.equals(name))))
-            return;
-        removeAll();
-        counter=0;
-        labels.clear();
-        this.sprite=sprite;
-        this.spriteName=name;
-        SwingAtlas atlas;
-        if(!cache.containsKey(sprite))
-        {
-            cache.put(sprite,new HashMap<>() );
-        }
-        if(!cache.get(sprite).containsKey(imageSize))
-        {
-            cache.get(sprite).put(imageSize,new SwingAtlas(Config.instance().getFile(sprite),imageSize) );
-        }
-        atlas=cache.get(sprite).get(imageSize);
-        int maxCount=0;
-        for(Map.Entry<String, ArrayList<ImageIcon>> element:atlas.getImages().entrySet())
-        {
-            if(name==null||element.getKey().equals(name))
-            {
-                JLabel image=new JLabel(element.getValue().get(0));
-                if(maxCount<element.getValue().size())
-                    maxCount=element.getValue().size();
-                add(new JLabel(element.getKey()));
-                add(image);
-                labels.add(Pair.of(image, element.getValue()));
-            }
-        }
-        if(maxCount<=1)
-        {
-            timer.stop();
-        }
-        else
-        {
-            timer.restart();
-        }
-//        doLayout(); //These lines cause images to bleed on to other tabs and don't appear to be needed
-//        revalidate();
-//        update(getGraphics());
-//        repaint();
-
-    }
-}

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

@@ -1,134 +0,0 @@
-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.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 TerrainsEditor extends JComponent{
-    DefaultListModel<BiomeTerrainData> model = new DefaultListModel<>();
-    JList<BiomeTerrainData> list = new JList<>(model);
-    JToolBar toolBar = new JToolBar("toolbar");
-    BiomeTerrainEdit edit=new BiomeTerrainEdit();
-
-    BiomeData currentData;
-
-    public class TerrainDataRenderer 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 BiomeTerrainData))
-                return label;
-            BiomeTerrainData terrainData=(BiomeTerrainData) value;
-            /*StringBuilder builder=new StringBuilder();
-            builder.append("Terrain");
-            builder.append(" ");
-            builder.append(terrainData.spriteName);*/
-            label.setText("Terrain " + terrainData.spriteName);
-            return label;
-        }
-    }
-    public void addButton(String name, ActionListener action)
-    {
-        JButton newButton=new JButton(name);
-        newButton.addActionListener(action);
-        toolBar.add(newButton);
-
-    }
-
-    public TerrainsEditor()
-    {
-
-        list.setCellRenderer(new TerrainDataRenderer());
-        list.addListSelectionListener(e -> TerrainsEditor.this.updateEdit());
-        addButton("add", e -> TerrainsEditor.this.addTerrain());
-        addButton("remove", e -> TerrainsEditor.this.remove());
-        addButton("copy", e -> TerrainsEditor.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() {
-        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;
-        BiomeTerrainData data=new BiomeTerrainData(model.get(selected));
-        model.add(model.size(),data);
-    }
-
-    private void updateEdit() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrentTerrain(model.get(selected),currentData);
-    }
-
-    void addTerrain()
-    {
-        BiomeTerrainData data=new BiomeTerrainData();
-        model.add(model.size(),data);
-    }
-    void remove()
-    {
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        model.remove(selected);
-    }
-    public void setTerrains(BiomeData data) {
-
-        currentData=data;
-        model.clear();
-        if(data==null||data.terrain==null)
-            return;
-        for (int i=0;i<data.terrain.length;i++) {
-            model.add(i,data.terrain[i]);
-        }
-        list.setSelectedIndex(0);
-    }
-
-    public BiomeTerrainData[] getBiomeTerrainData() {
-
-        BiomeTerrainData[] rewards= new BiomeTerrainData[model.getSize()];
-        for(int i=0;i<model.getSize();i++)
-        {
-            rewards[i]=model.get(i);
-        }
-        return rewards;
-    }
-    public void addChangeListener(ChangeListener listener) {
-        listenerList.add(ChangeListener.class, listener);
-    }
-}

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

@@ -1,118 +0,0 @@
-package forge.adventure.editor;
-
-import javax.swing.*;
-import java.awt.*;
-import java.util.List;
-
-/**
- * Editor class to edit configuration, maybe moved or removed
- */
-public class TextListEdit extends Box {
-    JTextField edit=new JTextField();
-    JButton findButton=new JButton(UIManager.getIcon("add"));
-    JComboBox elements;
-    public TextListEdit(String[] possibleElements) {
-        super(BoxLayout.X_AXIS);
-
-        findButton.addActionListener(e -> TextListEdit.this.find());
-
-        add(edit);
-        edit.setPreferredSize(new Dimension(400,edit.getPreferredSize().height));
-        add(findButton);
-        elements= new JComboBox(possibleElements);
-        add(elements);
-
-    }
-    public TextListEdit()
-    {
-        this(new String[0]);
-
-    }
-    JTextField getEdit()
-    {
-        return edit;
-    }
-
-    private void find() {
-        edit.setText((edit.getText().trim().length()>0?edit.getText() + ";": "")+elements.getSelectedItem().toString());
-        elements.remove(elements.getSelectedIndex());
-        elements.setSelectedIndex(0);
-//        JFileChooser fc = new JFileChooser();
-//        fc.setCurrentDirectory(new File(Config.instance().getFilePath("")));
-//        fc.setMultiSelectionEnabled(false);
-//        if (fc.showOpenDialog(this) ==
-//                JFileChooser.APPROVE_OPTION) {
-//            File selected = fc.getSelectedFile();
-//
-//            try {
-//                if (selected != null&&selected.getCanonicalPath().startsWith(new File(Config.instance().getFilePath("")).getCanonicalPath())) {
-//                    edit.setText(selected.getCanonicalPath().substring(new File(Config.instance().getFilePath("")).getCanonicalPath().length()+1));
-//                }
-//            } catch (IOException e) {
-//                e.printStackTrace();
-//            }
-//        }
-    }
-
-    public void setOptions(List<String> itemNames) {
-        if(itemNames==null)
-            elements.removeAllItems();
-        else {
-            for(String item: itemNames)
-                elements.addItem(item);
-        }
-    }
-
-    public void setText(List<String> itemNames) {
-        if(itemNames==null)
-            edit.setText("");
-        else
-            edit.setText(String.join(";",itemNames));
-    }
-    public void setText(String[] itemName) {
-        if(itemName==null)
-            edit.setText("");
-        else
-            edit.setText(String.join(";",itemName));
-    }
-
-    public void setText(int[] intValues) {
-        if(intValues==null)
-        {
-            edit.setText("");
-            return;
-        }
-        StringBuilder values= new StringBuilder();
-        for(int i=0;i<intValues.length;i++)
-        {
-            values.append(intValues[i]);
-            if(intValues.length>i+2)
-                values.append("\n");
-        }
-        edit.setText(values.toString());
-    }
-
-    public String[] getList() {
-        return edit.getText().isEmpty()?null:edit.getText().split(";");
-    }
-
-    public int[] getListAsInt() {
-        if(edit.getText().isEmpty())
-            return null;
-        String[] stringList=getList();
-        int[] retList=new int[stringList.length];
-        for(int i=0;i<retList.length;i++)
-        {
-            String intName=stringList[i];
-            try
-            {
-                retList[i] = Integer.parseInt(intName);
-            }
-            catch (NumberFormatException e)
-            {
-                retList[i] =0;
-            }
-        }
-        return retList;
-    }
-}

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

@@ -1,227 +0,0 @@
-package forge.adventure.editor;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonWriter;
-import forge.adventure.data.BiomeData;
-import forge.adventure.data.WorldData;
-import forge.adventure.util.Config;
-import forge.adventure.util.Paths;
-
-import javax.swing.*;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class WorldEditor extends JComponent {
-
-    WorldData  currentData;
-
-
-    IntSpinner width= new IntSpinner( 0, 100000, 1);
-    IntSpinner height= new IntSpinner( 0, 100000, 1);
-    FloatSpinner playerStartPosX= new FloatSpinner( 0, 1, .1f);
-    FloatSpinner playerStartPosY= new FloatSpinner(0, 1, .1f);
-    FloatSpinner noiseZoomBiome= new FloatSpinner( 0, 1000f, 1f);
-    IntSpinner tileSize= new IntSpinner( 0, 100000, 1);
-
-    JTextField  biomesSprites       =   new JTextField();
-    FloatSpinner maxRoadDistance        =   new FloatSpinner( 0, 100000f, 1f);
-    TextListEdit biomesNames        =   new TextListEdit();
-
-    DefaultListModel<BiomeData> model = new DefaultListModel<>();
-    JList<BiomeData> list = new JList<>(model);
-    BiomeEdit edit=new BiomeEdit();
-    JTabbedPane tabs =new JTabbedPane();
-    static HashMap<String,SwingAtlas> atlas=new HashMap<>();
-
-    public class BiomeDataRenderer 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 BiomeData biome))
-                return label;
-            // Get the renderer component from parent class
-
-            label.setText(biome.name);
-            if(!atlas.containsKey(biome.tilesetAtlas))
-                atlas.put(biome.tilesetAtlas,new SwingAtlas(Config.instance().getFile(biome.tilesetAtlas)));
-
-            SwingAtlas poiAtlas = atlas.get(biome.tilesetAtlas);
-
-            if(poiAtlas.has(biome.tilesetName))
-                label.setIcon(poiAtlas.get(biome.tilesetName));
-            else
-            {
-                ImageIcon img=poiAtlas.getAny();
-                if(img!=null)
-                    label.setIcon(img);
-            }
-            return label;
-        }
-    }
-
-    /**
-     *
-     */
-    private void updateBiome() {
-
-        int selected=list.getSelectedIndex();
-        if(selected<0)
-            return;
-        edit.setCurrentBiome(model.get(selected));
-    }
-
-    public WorldEditor() {
-        list.setCellRenderer(new BiomeDataRenderer());
-        list.addListSelectionListener(e -> WorldEditor.this.updateBiome());
-        BorderLayout layout = new BorderLayout();
-        setLayout(layout);
-        add(tabs);
-        JSplitPane biomeData=new JSplitPane();
-        tabs.addTab("BiomeData", biomeData);
-
-
-        FormPanel worldPanel=new FormPanel();
-        worldPanel.add("width:",width);
-        worldPanel.add("height:",height);
-        worldPanel.add("playerStartPosX:",playerStartPosX);
-        worldPanel.add("playerStartPosY:",playerStartPosY);
-        worldPanel.add("noiseZoomBiome:",noiseZoomBiome);
-        worldPanel.add("tileSize:",tileSize);
-        worldPanel.add("biomesSprites:",biomesSprites);
-        worldPanel.add("maxRoadDistance:",maxRoadDistance);
-        worldPanel.add("biomesNames:",biomesNames);
-        tabs.addTab("WorldData", worldPanel);
-
-
-        JScrollPane pane = new JScrollPane(edit);
-        biomeData.setLeftComponent(list);    biomeData.setRightComponent(pane);
-
-        load();
-
-        JToolBar toolBar = new JToolBar("toolbar");
-        add(toolBar, BorderLayout.PAGE_START);
-        JButton newButton=new JButton("save");
-        newButton.addActionListener(e -> WorldEditor.this.save());
-        toolBar.add(newButton);
-
-         newButton=new JButton("save selected biome");
-        newButton.addActionListener(e -> WorldEditor.this.saveBiome());
-        toolBar.add(newButton);
-
-        newButton=new JButton("load");
-        newButton.addActionListener(e -> WorldEditor.this.load());
-        toolBar.add(newButton);
-
-        toolBar.addSeparator();
-
-        newButton=new JButton("test map");
-        newButton.addActionListener(e -> WorldEditor.this.test());
-        toolBar.add(newButton);
-
-
-        newButton=new JButton("edit effects");
-        newButton.addActionListener(e -> WorldEditor.this.startEffectEditor());
-        toolBar.add(newButton);
-    }
-
-    private void startEffectEditor() {
-
-    }
-
-    private void test() {
-
-        String javaHome = System.getProperty("java.home");
-        String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
-        String classpath = System.getProperty("java.class.path");
-        String className = forge.adventure.Main.class.getName();
-
-        ArrayList<String> command = new ArrayList<>();
-        command.add(javaBin);
-        command.add("-cp");
-        command.add(classpath);
-        command.add(className);
-
-        command.add("testMap");
-
-        ProcessBuilder build=  new ProcessBuilder(command);
-        build .redirectInput(ProcessBuilder.Redirect.INHERIT)
-                .redirectOutput(ProcessBuilder.Redirect.INHERIT)
-                .redirectError(ProcessBuilder.Redirect.INHERIT);
-        try {
-           Process process=  build.start();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    void saveBiome()
-    {
-
-        edit.updateTerrain();
-        Json json = new Json(JsonWriter.OutputType.json);
-        FileHandle handle =  Config.instance().getFile(currentData.biomesNames[list.getSelectedIndex()]);
-        handle.writeString(json.prettyPrint(json.toJson(edit.currentData,  BiomeData.class)),false);
-
-    }
-    void save()
-    {
-        currentData.width=width.intValue();
-        currentData.height=height.intValue();
-        currentData.playerStartPosX=playerStartPosX.floatValue();
-        currentData.playerStartPosY=playerStartPosY.floatValue();
-        currentData.noiseZoomBiome=noiseZoomBiome.floatValue();
-        currentData.tileSize=tileSize.intValue();
-        currentData.biomesSprites=biomesSprites.getText();
-        currentData.maxRoadDistance=maxRoadDistance.floatValue();
-        currentData.biomesNames=  (biomesNames.getList());
-
-        Json json = new Json(JsonWriter.OutputType.json);
-        FileHandle handle = Config.instance().getFile(Paths.WORLD);
-        handle.writeString(json.prettyPrint(json.toJson(currentData,  WorldData.class)),false);
-
-    }
-    void load()
-    {
-
-
-
-        model.clear();
-        Json json = new Json();
-        FileHandle handle = Config.instance().getFile(Paths.WORLD);
-        if (handle.exists())
-        {
-              currentData=json.fromJson(WorldData.class, WorldData.class, handle);
-        }
-        update();
-    }
-
-    private void update() {
-        width.setValue(currentData.width);
-        height.setValue(currentData.height);
-        playerStartPosX.setValue(currentData.playerStartPosX);
-        playerStartPosY.setValue(currentData.playerStartPosY);
-        noiseZoomBiome.setValue(currentData.noiseZoomBiome);
-        tileSize.setValue(currentData.tileSize);
-        biomesSprites.setText(currentData.biomesSprites);
-        maxRoadDistance.setValue(currentData.maxRoadDistance);
-        biomesNames.setText(currentData.biomesNames);
-
-        for(String path:currentData.biomesNames)
-        {
-            Json json = new Json();
-            FileHandle handle = Config.instance().getFile(path);
-            if (handle.exists())
-            {
-                BiomeData data=json.fromJson(BiomeData.class, BiomeData.class, handle);
-                model.addElement(data);
-            }
-        }
-
-    }
-}

forge-adventure/pom.xml

@@ -0,0 +1,287 @@
+<?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.50-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>forge-adventure</artifactId>
+    <packaging>jar</packaging>
+    <name>Forge Adventure</name>
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+    <build>
+        <sourceDirectory>src</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>**/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-java8.exe</outfile>
+                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
+                                <dontWrapJar>true</dontWrapJar>
+                                <errTitle>forge</errTitle>
+                                <icon>src/main/config/forge-adventure.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</productName>
+                                    <internalName>forge-adventure</internalName>
+                                    <originalFilename>forge-adventure-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.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.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.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.font=ALL-UNNAMED</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</productName>
+                                    <internalName>forge-adventure</internalName>
+                                    <originalFilename>forge-adventure.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.sh, forge-adventure.command, forge-adventure.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.github.jetopto1</groupId>
+            <artifactId>cling</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx</artifactId>
+            <version>1.10.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-platform</artifactId>
+            <version>1.10.0</version>
+            <classifier>natives-desktop</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-freetype</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-backend-lwjgl3</artifactId>
+            <version>1.10.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.badlogicgames.gdx</groupId>
+            <artifactId>gdx-freetype-platform</artifactId>
+            <version>1.10.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-game</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>forge</groupId>
+            <artifactId>forge-ai</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>forge</groupId>
+            <artifactId>forge-gui-mobile</artifactId>
+            <version>1.6.50-SNAPSHOT</version>
+            <scope>compile</scope>
+        </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,15 @@
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+varying vec4 v_color;
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
+uniform float u_grayness;
+
+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 = vec4(blendedColor.rgb, c.a);
+}

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,23 @@
+#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;
+
+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);
+
+    gl_FragColor = texture2D(u_texture, uv);
+}

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.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.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=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 -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

@@ -0,0 +1,190 @@
+package forge.adventure;
+
+import com.badlogic.gdx.ApplicationListener;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Clipboard;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Window;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3WindowListener;
+import com.badlogic.gdx.graphics.glutils.HdpiMode;
+import forge.Forge;
+import forge.adventure.util.Config;
+import forge.interfaces.IDeviceAdapter;
+import forge.util.BuildInfo;
+import forge.util.FileUtil;
+import forge.util.OperatingSystem;
+import forge.util.RestartUtil;
+import io.sentry.Sentry;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+/**
+ * Main entry point
+ */
+public class Main {
+
+    public static void main(String[] args) {
+
+        Sentry.init(options -> {
+            options.setEnableExternalConfiguration(true);
+            options.setRelease(BuildInfo.getVersionString());
+            options.setEnvironment(System.getProperty("os.name"));
+            options.setTag("Java Version", System.getProperty("java.version"));
+        }, true);
+
+        // HACK - temporary solution to "Comparison method violates it's general contract!" crash
+        System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
+
+        //Turn off the Java 2D system's use of Direct3D to improve rendering speed (particularly when Full Screen)
+        System.setProperty("sun.java2d.d3d", "false");
+
+
+        Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
+        config.setResizable(false);
+        ApplicationListener start = Forge.getApp(new Lwjgl3Clipboard(), new DesktopAdapter(""), Files.exists(Paths.get("./res"))?"./":"../forge-gui/", true, false, 0, true, 0, "", "");
+
+        if (Config.instance().getSettingData().fullScreen) {
+            config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode());
+            config.setAutoIconify(true);
+            config.setHdpiMode(HdpiMode.Logical);
+        } else {
+            config.setWindowedMode(Config.instance().getSettingData().width, Config.instance().getSettingData().height);
+        }
+        config.setTitle("Forge Adventure Mobile");
+        config.setWindowIcon(Config.instance().getFilePath("forge-adventure.png"));
+        config.setWindowListener(new Lwjgl3WindowListener() {
+            @Override
+            public void created(Lwjgl3Window lwjgl3Window) {
+
+            }
+
+            @Override
+            public void iconified(boolean b) {
+
+            }
+
+            @Override
+            public void maximized(boolean b) {
+
+            }
+
+            @Override
+            public void focusLost() {
+
+            }
+
+            @Override
+            public void focusGained() {
+
+            }
+
+            @Override
+            public boolean closeRequested() {
+                //use the device adpater to exit properly
+                if (Forge.safeToClose)
+                    Forge.exit(true);
+                return false;
+            }
+
+            @Override
+            public void filesDropped(String[] strings) {
+
+            }
+
+            @Override
+            public void refreshRequested() {
+
+            }
+        });
+
+
+        new Lwjgl3Application(start, config);
+
+    }
+
+    private static class DesktopAdapter implements IDeviceAdapter {
+        private final String switchOrientationFile;
+
+        private DesktopAdapter(String switchOrientationFile0) {
+            switchOrientationFile = switchOrientationFile0;
+        }
+
+        //just assume desktop always connected to wifi
+        @Override
+        public boolean isConnectedToInternet() {
+            return true;
+        }
+
+        @Override
+        public boolean isConnectedToWifi() {
+            return true;
+        }
+
+        @Override
+        public String getDownloadsDir() {
+            return System.getProperty("user.home") + "/Downloads/";
+        }
+
+        @Override
+        public boolean openFile(String filename) {
+            try {
+                Desktop.getDesktop().open(new File(filename));
+                return true;
+            }
+            catch (IOException e) {
+                e.printStackTrace();
+            }
+            return false;
+        }
+
+        @Override
+        public void restart() {
+            if (RestartUtil.prepareForRestart()) {
+                Gdx.app.exit();
+                System.exit(0);
+            }
+        }
+
+        @Override
+        public void exit() {
+            Gdx.app.exit(); //can just use Gdx.app.exit for desktop
+            System.exit(0);
+        }
+
+        @Override
+        public boolean isTablet() {
+            return true; //treat desktop the same as a tablet
+        }
+
+        @Override
+        public void setLandscapeMode(boolean landscapeMode) {
+            //create file to indicate that landscape mode should be used
+            if (landscapeMode) {
+                FileUtil.writeFile(switchOrientationFile, "1");
+            }
+            else {
+                FileUtil.deleteFile(switchOrientationFile);
+            }
+        }
+
+        @Override
+        public void preventSystemSleep(boolean preventSleep) {
+            OperatingSystem.preventSystemSleep(preventSleep);
+        }
+
+        @Override
+        public void convertToJPEG(InputStream input, OutputStream output) throws IOException {
+            BufferedImage image = ImageIO.read(input);
+            ImageIO.write(image, "jpg", output);
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package forge.adventure.editor;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class EditorMainWindow extends JFrame {
+    JTabbedPane tabs =new JTabbedPane();
+
+    public EditorMainWindow()
+    {
+        BorderLayout layout=new BorderLayout();
+        setLayout(layout);
+        add(tabs);
+        tabs.addTab("POI",new PointOfInterestEditor());
+        tabs.addTab("World",new WorldEditor());
+        tabs.addTab("Items",new ItemsEditor());
+        tabs.addTab("Enemies",new EnemyEditor());
+        setVisible(true);
+        setSize(800,600);
+    }
+}

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

@@ -5,6 +5,7 @@ import forge.adventure.data.EffectData;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class EffectEditor extends JComponent  {
     EffectData currentData;
@@ -24,15 +25,16 @@ public class EffectEditor extends JComponent  {
         if(!isOpponentEffect)
             opponent=new EffectEditor(true);
         setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
-        FormPanel parameters=new FormPanel();
+        JPanel parameters=new JPanel();
         parameters.setBorder(BorderFactory.createTitledBorder("Effect"));
+        parameters.setLayout(new GridLayout(7,2)) ;
 
-        parameters.add("Name:",  name);
-        parameters.add("Start with extra cards:",    changeStartCards);
-        parameters.add("Change life:",             lifeModifier);
-        parameters.add("Movement speed:",          moveSpeed);
-        parameters.add("Start battle with cards:",    startBattleWithCard);
-        parameters.add("color view:",              colorView);
+        parameters.add(new JLabel("Name:"));                        parameters.add(name);
+        parameters.add(new JLabel("Start with extra cards:"));      parameters.add(changeStartCards);
+        parameters.add(new JLabel("Change life:"));                 parameters.add(lifeModifier);
+        parameters.add(new JLabel("Movement speed:"));              parameters.add(moveSpeed);
+        parameters.add(new JLabel("Start battle with cards:"));     parameters.add(startBattleWithCard);
+        parameters.add(new JLabel("color view:"));                  parameters.add(colorView);
         add(parameters);
         if(!isOpponentEffect)
         {    add(new JLabel("Opponent:")); add(opponent);}
@@ -42,8 +44,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 +59,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

@@ -0,0 +1,111 @@
+package forge.adventure.editor;
+
+import forge.adventure.data.EnemyData;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class EnemyEdit extends JComponent {
+    EnemyData currentData;
+
+
+    JTextField nameField=new JTextField();
+    JTextField colorField=new JTextField();
+    JSpinner lifeFiled= new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
+    JSpinner spawnRate= new JSpinner(new SpinnerNumberModel(0.0, 0., 1, 0.1));
+    JSpinner difficulty= new JSpinner(new SpinnerNumberModel(0.0, 0., 1, 0.1));
+    JSpinner speed= new JSpinner(new SpinnerNumberModel(0.0, 0., 100., 1.0));
+    FilePicker deck=new FilePicker(new String[]{"dck","json"});
+    FilePicker atlas=new FilePicker(new String[]{"atlas"});
+    JTextField equipment=new JTextField();
+    RewardsEditor rewards=new RewardsEditor();
+    SwingAtlasPreview preview=new SwingAtlasPreview();
+    private boolean updating=false;
+
+    public EnemyEdit()
+    {
+
+        JComponent center=new JComponent() {  };
+        center.setLayout(new GridLayout(9,2));
+
+        center.add(new JLabel("Name:")); center.add(nameField);
+        center.add(new JLabel("Life:")); center.add(lifeFiled);
+        center.add(new JLabel("Spawn rate:")); center.add(spawnRate);
+        center.add(new JLabel("Difficulty:")); center.add(difficulty);
+        center.add(new JLabel("Speed:")); center.add(speed);
+        center.add(new JLabel("Deck:")); center.add(deck);
+        center.add(new JLabel("Sprite:")); center.add(atlas);
+        center.add(new JLabel("Equipment:")); center.add(equipment);
+        center.add(new JLabel("Colors:")); center.add(colorField);
+        BorderLayout layout=new BorderLayout();
+        setLayout(layout);
+        add(center,BorderLayout.PAGE_START);
+        add(rewards,BorderLayout.CENTER);
+        add(preview,BorderLayout.LINE_START);
+
+        equipment.getDocument().addDocumentListener(new DocumentChangeListener(() -> EnemyEdit.this.updateEnemy()));
+        atlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> EnemyEdit.this.updateEnemy()));
+        colorField.getDocument().addDocumentListener(new DocumentChangeListener(() -> EnemyEdit.this.updateEnemy()));
+        nameField.getDocument().addDocumentListener(new DocumentChangeListener(() -> EnemyEdit.this.updateEnemy()));
+        deck.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> EnemyEdit.this.updateEnemy()));
+        lifeFiled.addChangeListener(e -> EnemyEdit.this.updateEnemy());
+        speed.addChangeListener(e -> EnemyEdit.this.updateEnemy());
+        difficulty.addChangeListener(e -> EnemyEdit.this.updateEnemy());
+        spawnRate.addChangeListener(e -> EnemyEdit.this.updateEnemy());
+        rewards.addChangeListener(e -> EnemyEdit.this.updateEnemy());
+        lifeFiled.addChangeListener(e -> EnemyEdit.this.updateEnemy());
+        refresh();
+    }
+
+    private void updateEnemy() {
+        if(currentData==null||updating)
+            return;
+        currentData.name=nameField.getText();
+        currentData.colors=colorField.getText();
+        currentData.life= (int) lifeFiled.getValue();
+        currentData.sprite= atlas.getEdit().getText();
+        if(equipment.getText().isEmpty())
+            currentData.equipment=null;
+        else
+            currentData.equipment=equipment.getText().split(",");
+        currentData.speed=  ((Double)  speed.getValue()).floatValue();
+        currentData.spawnRate=((Double)  spawnRate.getValue()).floatValue();
+        currentData.difficulty=((Double)  difficulty.getValue()).floatValue();
+        currentData.deck= deck.getEdit().getText();
+        currentData.rewards= rewards.getRewards();
+        preview.setSpritePath(currentData.sprite);
+    }
+
+    public void setCurrentEnemy(EnemyData data)
+    {
+        currentData=data;
+        refresh();
+    }
+
+    private void refresh() {
+        setEnabled(currentData!=null);
+        if(currentData==null)
+        {
+            return;
+        }
+        updating=true;
+        nameField.setText(currentData.name);
+        colorField.setText(currentData.colors);
+        lifeFiled.setValue(currentData.life);
+        atlas.getEdit().setText(currentData.sprite);
+        if(currentData.equipment!=null)
+            equipment.setText(String.join(",",currentData.equipment));
+        else
+            equipment.setText("");
+        deck.getEdit().setText(currentData.deck);
+        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);
+        updating=false;
+    }
+}

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

@@ -0,0 +1,161 @@
+package forge.adventure.editor;
+
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonWriter;
+import forge.adventure.data.EnemyData;
+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.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class EnemyEditor extends JComponent {
+    DefaultListModel<EnemyData> model = new DefaultListModel<>();
+    JList<EnemyData> list = new JList<>(model);
+    JToolBar toolBar = new JToolBar("toolbar");
+    EnemyEdit edit=new EnemyEdit();
+
+
+
+    public class EnemyDataRenderer 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 EnemyData))
+                return label;
+            EnemyData enemy=(EnemyData) value;
+            // Get the renderer component from parent class
+
+            label.setText(enemy.name);
+            SwingAtlas atlas=new SwingAtlas(Config.instance().getFile(enemy.sprite));
+            if(atlas.has("Avatar"))
+                label.setIcon(atlas.get("Avatar"));
+            else
+            {
+                ImageIcon img=atlas.getAny();
+                if(img!=null)
+                    label.setIcon(img);
+            }
+            return label;
+        }
+    }
+    public void addButton(String name,ActionListener action)
+    {
+        JButton newButton=new JButton(name);
+        newButton.addActionListener(action);
+        toolBar.add(newButton);
+
+    }
+    public EnemyEditor()
+    {
+
+        list.setCellRenderer(new EnemyDataRenderer());
+        list.addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                EnemyEditor.this.updateEdit();
+            }
+        });
+        addButton("add", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                EnemyEditor.this.addEnemy();
+            }
+        });
+        addButton("remove", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                EnemyEditor.this.remove();
+            }
+        });
+        addButton("copy", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                EnemyEditor.this.copy();
+            }
+        });
+        addButton("load", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                EnemyEditor.this.load();
+            }
+        });
+        addButton("save", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                EnemyEditor.this.save();
+            }
+        });
+        BorderLayout layout=new BorderLayout();
+        setLayout(layout);
+        add(new JScrollPane(list), BorderLayout.LINE_START);
+        add(toolBar, BorderLayout.PAGE_START);
+        add(edit,BorderLayout.CENTER);
+        load();
+    }
+    private void copy() {
+
+        int selected=list.getSelectedIndex();
+        if(selected<0)
+            return;
+        EnemyData data=new EnemyData(model.get(selected));
+        model.add(model.size(),data);
+    }
+    private void updateEdit() {
+
+        int selected=list.getSelectedIndex();
+        if(selected<0)
+            return;
+        edit.setCurrentEnemy(model.get(selected));
+    }
+
+    void save()
+    {
+        Array<EnemyData> allEnemies=new Array<>();
+        for(int i=0;i<model.getSize();i++)
+            allEnemies.add(model.get(i));
+        Json json = new Json(JsonWriter.OutputType.json);
+        FileHandle handle = Config.instance().getFile(Paths.ENEMIES);
+        handle.writeString(json.prettyPrint(json.toJson(allEnemies,Array.class, EnemyData.class)),false);
+
+    }
+    void load()
+    {
+        model.clear();
+        Array<EnemyData> allEnemies=new Array<>();
+        Json json = new Json();
+        FileHandle handle = Config.instance().getFile(Paths.ENEMIES);
+        if (handle.exists())
+        {
+            Array readEnemies=json.fromJson(Array.class, EnemyData.class, handle);
+            allEnemies = readEnemies;
+        }
+        for (int i=0;i<allEnemies.size;i++) {
+            model.add(i,allEnemies.get(i));
+        }
+    }
+    void addEnemy()
+    {
+        EnemyData data=new EnemyData();
+        data.name="Enemy "+model.getSize();
+        model.add(model.size(),data);
+    }
+    void remove()
+    {
+        int selected=list.getSelectedIndex();
+        if(selected<0)
+            return;
+        model.remove(selected);
+    }
+}

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/ItemEdit.java

@@ -0,0 +1,88 @@
+package forge.adventure.editor;
+
+import forge.adventure.data.ItemData;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class ItemEdit extends JComponent {
+    ItemData currentData;
+
+
+    JTextField nameField=new JTextField();
+    JTextField equipmentSlot=new JTextField();
+    JTextField iconName=new JTextField();
+    EffectEditor effect=new EffectEditor(false);
+    JTextField description=new JTextField();
+    JCheckBox questItem=new JCheckBox();
+    JSpinner cost= new JSpinner(new SpinnerNumberModel(0, 0, 100000, 1));
+
+    private boolean updating=false;
+
+    public ItemEdit()
+    {
+
+        setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
+        JPanel parameters=new JPanel();
+        parameters.setBorder(BorderFactory.createTitledBorder("Parameter"));
+        parameters.setLayout(new GridLayout(6,2)) ;
+
+        parameters.add(new JLabel("Name:")); parameters.add(nameField);
+        parameters.add(new JLabel("equipmentSlot:")); parameters.add(equipmentSlot);
+        parameters.add(new JLabel("description:")); parameters.add(description);
+        parameters.add(new JLabel("iconName")); parameters.add(iconName);
+        parameters.add(new JLabel("questItem")); parameters.add(questItem);
+        parameters.add(new JLabel("cost")); parameters.add(cost);
+
+        add(parameters);
+        add(effect);
+
+        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());
+        refresh();
+    }
+
+    private void updateItem() {
+        if(currentData==null||updating)
+            return;
+        currentData.name=nameField.getText();
+        currentData.equipmentSlot=  equipmentSlot.getText();
+        currentData.effect= effect.getCurrentEffect();
+        currentData.description=description.getText();
+        currentData.iconName=iconName.getText();
+        currentData.questItem=questItem.isSelected();
+        currentData.cost=((Integer)  cost.getValue()).intValue();
+    }
+
+    public void setCurrentItem(ItemData data)
+    {
+        currentData=data;
+        refresh();
+    }
+
+    private void refresh() {
+        setEnabled(currentData!=null);
+        if(currentData==null)
+        {
+            return;
+        }
+        updating=true;
+        nameField.setText(currentData.name);
+        effect.setCurrentEffect(currentData.effect);
+        equipmentSlot.setText(currentData.equipmentSlot);
+        description.setText(currentData.description);
+        iconName.setText(currentData.iconName);
+        questItem.setSelected(currentData.questItem);
+        cost.setValue(currentData.cost);
+
+        updating=false;
+    }
+}

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();
@@ -66,7 +67,6 @@ public class ItemsEditor extends JComponent {
         BorderLayout layout=new BorderLayout();
         setLayout(layout);
         add(new JScrollPane(list), BorderLayout.LINE_START);
-        toolBar.setFloatable(false);
         add(toolBar, BorderLayout.PAGE_START);
         add(edit,BorderLayout.CENTER);
         load();
@@ -105,7 +105,8 @@ public class ItemsEditor extends JComponent {
         FileHandle handle = Config.instance().getFile(Paths.ITEMS);
         if (handle.exists())
         {
-            allEnemies =json.fromJson(Array.class, ItemData.class, handle);
+            Array readEnemies=json.fromJson(Array.class, ItemData.class, handle);
+            allEnemies = readEnemies;
         }
         for (int i=0;i<allEnemies.size;i++) {
             model.add(i,allEnemies.get(i));

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

@@ -0,0 +1,20 @@
+package forge.adventure.editor;
+
+import forge.GuiMobile;
+import forge.adventure.util.Config;
+import forge.gui.GuiBase;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class Main {
+    public static void main(String[] args) {
+        GuiBase.setInterface(new GuiMobile(Files.exists(Paths.get("./res"))?"./":"../forge-gui/"));
+        GuiBase.setDeviceInfo("", "", 0, 0);
+        Config.instance();
+         new EditorMainWindow();
+    }
+}

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

@@ -0,0 +1,6 @@
+package forge.adventure.editor;
+
+import java.awt.*;
+
+public class PointOfInterestEditor extends Component {
+}

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

@@ -0,0 +1,228 @@
+package forge.adventure.editor;
+
+import forge.adventure.data.RewardData;
+import forge.card.CardType;
+import forge.game.keyword.Keyword;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class RewardEdit extends JComponent {
+    RewardData currentData;
+
+    JComboBox typeField =new JComboBox(new String[] { "card", "gold", "life", "deckCard", "item"});
+    JSpinner probability = new JSpinner(new SpinnerNumberModel(0f, 0, 1, 0.1f));
+    JSpinner count = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
+    JSpinner addMaxCount = new JSpinner(new SpinnerNumberModel(0, 0, 1000, 1));
+    JTextField cardName =new JTextField();
+    JTextField itemName =new JTextField();
+    TextListEdit editions =new TextListEdit();
+    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.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.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;
+
+    public RewardEdit()
+    {
+        setLayout(new GridLayout(16,2));
+
+        add(new JLabel("Type:")); add(typeField);
+        add(new JLabel("probability:")); add(probability);
+        add(new JLabel("count:")); add(count);
+        add(new JLabel("addMaxCount:")); add(addMaxCount);
+        add(new JLabel("cardName:")); add(cardName);
+        add(new JLabel("itemName:")); add(itemName);
+        add(new JLabel("editions:")); add(editions);
+        add(new JLabel("colors:")); add(colors);
+        add(new JLabel("rarity:")); add(rarity);
+        add(new JLabel("subTypes:")); add(subTypes);
+        add(new JLabel("cardTypes:")); add(cardTypes);
+        add(new JLabel("superTypes:")); add(superTypes);
+        add(new JLabel("manaCosts:")); add(manaCosts);
+        add(new JLabel("keyWords:")); add(keyWords);
+        add(new JLabel("colorType:")); add(colorType);
+        add(new JLabel("cardText:")); add(cardText);
+
+
+        typeField.addActionListener((new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        probability.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                RewardEdit.this.updateReward();
+            }
+        });
+        count.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                RewardEdit.this.updateReward();
+            }
+        });
+        addMaxCount.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                RewardEdit.this.updateReward();
+            }
+        });
+        cardName.getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        itemName.getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        editions.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        colors.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        rarity.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        subTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        cardTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        superTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        manaCosts.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        keyWords.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        colorType.addActionListener((new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                RewardEdit.this.updateReward();
+            }
+        }));
+        cardText.getDocument().addDocumentListener(new DocumentChangeListener(new Runnable() {
+            @Override
+            public void run() {
+                RewardEdit.this.updateReward();
+            }
+        }));
+
+    }
+
+    private void updateReward() {
+        if(currentData==null||updating)
+            return;
+
+
+        currentData.type=typeField.getSelectedItem()==null?null:typeField.getSelectedItem().toString();
+        currentData.probability=((Double)probability.getValue()).floatValue();
+        currentData.count= (int) count.getValue();
+        currentData.addMaxCount= (int) addMaxCount.getValue();
+        currentData.cardName = cardName.getText().isEmpty()?null:cardName.getText();
+        currentData.itemName = itemName.getText().isEmpty()?null:itemName.getText();
+        currentData.editions = editions.getList();
+        currentData.colors = colors.getList();
+        currentData.rarity = rarity.getList();
+        currentData.subTypes = subTypes.getList();
+        currentData.cardTypes = cardTypes.getList();
+        currentData.superTypes = superTypes.getList();
+        currentData.manaCosts = manaCosts.getListAsInt();
+        currentData.keyWords = keyWords.getList();
+        currentData.colorType=colorType.getSelectedItem()==null?null:colorType.getSelectedItem().toString();
+        currentData.cardText = cardText.getText().isEmpty()?null:cardText.getText();
+
+        ChangeListener[] listeners = listenerList.getListeners(ChangeListener.class);
+        if (listeners != null && listeners.length > 0) {
+            ChangeEvent evt = new ChangeEvent(this);
+            for (ChangeListener listener : listeners) {
+                listener.stateChanged(evt);
+            }
+        }
+
+    }
+    public void addChangeListener(ChangeListener l) {
+        listenerList.add(ChangeListener.class, l);
+    }
+    public void setCurrentReward(RewardData data)
+    {
+        currentData=data;
+        refresh();
+    }
+
+    private void refresh() {
+        setEnabled(currentData!=null);
+        if(currentData==null)
+        {
+            return;
+        }
+        updating=true;
+        typeField.setSelectedItem(currentData.type);
+
+        probability.setValue(new Double(currentData.probability));
+        count.setValue(currentData.count);
+        addMaxCount.setValue(currentData.addMaxCount);
+        cardName.setText(currentData.cardName);
+        itemName.setText(currentData.itemName);
+        editions.setText(currentData.editions);
+        colors.setText(currentData.colors);
+        rarity.setText(currentData.rarity);
+        subTypes.setText(currentData.subTypes);
+        cardTypes.setText(currentData.cardTypes);
+        superTypes.setText(currentData.superTypes);
+        manaCosts.setText(currentData.manaCosts);
+        keyWords.setText(currentData.keyWords);
+        colorType.setSelectedItem(currentData.colorType);
+        cardText.setText(currentData.cardText);
+
+
+        updating=false;
+    }
+}

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

@@ -5,7 +5,10 @@ import forge.adventure.data.RewardData;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.*;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
@@ -16,7 +19,7 @@ public class RewardsEditor extends JComponent{
     JList<RewardData> list = new JList<>(model);
     JToolBar toolBar = new JToolBar("toolbar");
     RewardEdit edit=new RewardEdit();
-    boolean updating;
+
 
 
     public class RewardDataRenderer extends DefaultListCellRenderer {
@@ -56,10 +59,30 @@ public class RewardsEditor extends JComponent{
     {
 
         list.setCellRenderer(new RewardDataRenderer());
-        list.addListSelectionListener(e -> RewardsEditor.this.updateEdit());
-        addButton("add", e -> RewardsEditor.this.addReward());
-        addButton("remove", e -> RewardsEditor.this.remove());
-        addButton("copy", e -> RewardsEditor.this.copy());
+        list.addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                RewardsEditor.this.updateEdit();
+            }
+        });
+        addButton("add", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                RewardsEditor.this.addReward();
+            }
+        });
+        addButton("remove", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                RewardsEditor.this.remove();
+            }
+        });
+        addButton("copy", new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                RewardsEditor.this.copy();
+            }
+        });
         BorderLayout layout=new BorderLayout();
         setLayout(layout);
         add(list, BorderLayout.LINE_START);
@@ -67,11 +90,14 @@ public class RewardsEditor extends JComponent{
         add(edit,BorderLayout.CENTER);
 
 
-        edit.addChangeListener(e -> emitChanged());
+        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);
@@ -128,12 +154,6 @@ public class RewardsEditor extends JComponent{
         }
         return rewards;
     }
-
-    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/SwingAtlas.java

@@ -0,0 +1,69 @@
+package forge.adventure.editor;
+
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.utils.Array;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import static java.awt.Image.SCALE_FAST;
+
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class SwingAtlas {
+
+    HashMap<String, ArrayList<ImageIcon>> images=new  HashMap<>();
+    public HashMap<String, ArrayList<ImageIcon>> getImages()
+    {
+        return images;
+    }
+    public  SwingAtlas(FileHandle path)
+    {
+        if(!path.exists()||!path.toString().endsWith(".atlas"))
+            return;
+        TextureAtlas.TextureAtlasData data=new TextureAtlas.TextureAtlasData(path,path.parent(),false);
+        for(TextureAtlas.TextureAtlasData.Region region: new Array.ArrayIterator<>(data.getRegions()))
+        {
+             String name=region.name;
+             if(!images.containsKey(name))
+             {
+                 images.put(name,new ArrayList<>());
+             }
+            ArrayList<ImageIcon> imageList=images.get(name);
+            try {
+                imageList.add(spriteToImage(region));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private ImageIcon spriteToImage(TextureAtlas.TextureAtlasData.Region sprite) throws IOException {
+        BufferedImage img = ImageIO.read(sprite.page.textureFile.file());
+        return new ImageIcon(img.getSubimage(sprite.left,sprite.top, sprite.width, sprite.height).getScaledInstance(32,32,SCALE_FAST));
+    }
+
+    public ImageIcon get(String name) {
+        return images.get(name).get(0);
+    }
+
+    public boolean has(String name) {
+        return images.containsKey(name);
+    }
+
+    public ImageIcon getAny() {
+        if(images.isEmpty())
+            return null;
+        ArrayList<ImageIcon> imageList= images.get(images.keySet().iterator().next());
+        if(imageList.isEmpty())
+            return null;
+        return imageList.get(0);
+    }
+}

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

@@ -0,0 +1,52 @@
+package forge.adventure.editor;
+
+import forge.adventure.util.Config;
+import org.apache.commons.lang3.tuple.Pair;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class SwingAtlasPreview extends Box {
+    private String sprite="";
+    Timer timer;
+    public SwingAtlasPreview() {
+        super(BoxLayout.Y_AXIS);
+
+         timer = new Timer(200, new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                counter++;
+                for (Pair<JLabel, ArrayList<ImageIcon>> element : labels) {
+                    element.getKey().setIcon(element.getValue().get(counter % element.getValue().size()));
+                }
+            }
+        });
+    }
+    int counter=0;
+    List<Pair<JLabel,ArrayList<ImageIcon>>> labels=new ArrayList<>();
+    public void setSpritePath(String sprite) {
+
+        if(this.sprite==null||this.sprite.equals(sprite))
+            return;
+        removeAll();
+        counter=0;
+        labels.clear();
+        this.sprite=sprite;
+        SwingAtlas atlas=new SwingAtlas(Config.instance().getFile(sprite));
+        for(Map.Entry<String, ArrayList<ImageIcon>> element:atlas.getImages().entrySet())
+        {
+            JLabel image=new JLabel(element.getValue().get(0));
+            add(new JLabel(element.getKey()));
+            add(image);
+            labels.add(Pair.of(image, element.getValue()));
+        }
+        timer.restart();
+        repaint();
+    }
+}

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

@@ -0,0 +1,108 @@
+package forge.adventure.editor;
+
+import forge.adventure.util.Config;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Editor class to edit configuration, maybe moved or removed
+ */
+public class TextListEdit extends Box {
+    JTextField edit=new JTextField();
+    JButton findButton=new JButton(UIManager.getIcon("add"));
+    JComboBox elements;
+    public TextListEdit(String[] possibleElements) {
+        super(BoxLayout.X_AXIS);
+
+        findButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                TextListEdit.this.find();
+            }
+        });
+
+        add(edit);
+        //add(findButton);
+        elements= new JComboBox(possibleElements);
+        add(elements);
+
+    }
+    public TextListEdit()
+    {
+        this(new String[0]);
+
+    }
+    JTextField getEdit()
+    {
+        return edit;
+    }
+
+    private void find() {
+        JFileChooser fc = new JFileChooser();
+        fc.setCurrentDirectory(new File(Config.instance().getFilePath("")));
+        fc.setMultiSelectionEnabled(false);
+        if (fc.showOpenDialog(this) ==
+                JFileChooser.APPROVE_OPTION) {
+            File selected = fc.getSelectedFile();
+
+            try {
+                if (selected != null&&selected.getCanonicalPath().startsWith(new File(Config.instance().getFilePath("")).getCanonicalPath())) {
+                    edit.setText(selected.getCanonicalPath().substring(new File(Config.instance().getFilePath("")).getCanonicalPath().length()+1));
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void setText(String[] itemName) {
+        if(itemName==null)
+            edit.setText("");
+        else
+            edit.setText(String.join(";",itemName));
+    }
+
+    public void setText(int[] intValues) {
+        if(intValues==null)
+        {
+            edit.setText("");
+            return;
+        }
+        StringBuilder values= new StringBuilder();
+        for(int i=0;i<intValues.length;i++)
+        {
+            values.append(intValues[i]);
+            if(intValues.length>i+2)
+                values.append(";");
+        }
+        edit.setText(values.toString());
+    }
+
+    public String[] getList() {
+        return edit.getText().isEmpty()?null:edit.getText().split(";");
+    }
+
+    public int[] getListAsInt() {
+        if(edit.getText().isEmpty())
+            return null;
+        String[] stringList=getList();
+        int[] retList=new int[stringList.length];
+        for(int i=0;i<retList.length;i++)
+        {
+            String intName=stringList[i];
+            try
+            {
+                retList[i] = Integer.valueOf(intName);
+            }
+            catch (NumberFormatException e)
+            {
+                retList[i] =0;
+            }
+        }
+        return retList;
+    }
+}

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

@@ -0,0 +1,6 @@
+package forge.adventure.editor;
+
+import java.awt.*;
+
+public class WorldEditor extends Component {
+}

forge-ai/pom.xml

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

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

@@ -1,9 +0,0 @@
-package forge.ai;
-
-public record AiAbilityDecision(int rating, AiPlayDecision decision) {
-    private static int MIN_RATING = 30;
-
-    public boolean willingToPlay() {
-        return rating > MIN_RATING && decision.willingToPlay();
-    }
-}