Merge remote-tracking branch 'origin/rogue_backend' into develop

# Conflicts:
#	.yarn/install-state.gz
#	spellsource-game/src/main/java/net/demilich/metastone/game/cards/Attribute.java
#	spellsource-game/src/main/java/net/demilich/metastone/game/cards/desc/CardDescArg.java
#	spellsource-game/src/main/java/net/demilich/metastone/game/entities/heroes/HeroClass.java
#	spellsource-game/src/main/java/net/demilich/metastone/game/logic/GameLogic.java
#	spellsource-protos/src/main/csharp/HiddenSwitch/Framework/Sources/Spellsource.cs
#	spellsource-protos/src/main/proto/spellsource.proto

Author: doctorpangloss

.yarn/install-state.gz

@@ -53,7 +53,7 @@ Hit `Win + X` and click Windows PowerShell (Admin). Then run the following:
 Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 # install dependencies
 wsl --install
-choco install -y gsudo git.portable 7zip openjdk vcredist140 docker-desktop dotnet-sdk nvm python gradle
+choco install -y gsudo git.portable 7zip openjdk vcredist140 docker-desktop dotnet-sdk nvm python
 # separately add vs2022 compilation tools with clang
 # must be run separately
 choco install -y visualstudio2022buildtools
@@ -89,18 +89,18 @@ git submodule update --init --recursive
 You should now be able to run the tests.
 
 ```shell
-gradle test
+./gradlew.bat test
 ```
 
 Start a local server and website using:
 
 ```shell
-gradle runServer
+./gradlew.bat runServer
 ```
 
 ### Unity Requirements
 
-Install Unity 6 with the iOS, macOS, Windows, and Android modules for your platform. You should not install Visual Studio.
+Install Unity 6.2 beta with the iOS, macOS, Windows, and Android modules for your platform. You should not install Visual Studio.
 
 ##### Getting Around Unity
 
@@ -217,10 +217,8 @@ Requirements: **Java 21 or later** and **Docker**. Check your current version of
    # Docker. Look carefully at any messages brew tells you and do them
    brew cask install docker
    # Java (if required)
-   # Install openjdk 21 or later, dotnet 6.0 & gradle 8.3 or higher
-   brew install openjdk dotnet-sdk gradle
-   sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
-   brew link --force openjdk
+   # Install openjdk 21 or later, dotnet 6.0 or higher
+   brew install openjdk dotnet-sdk
    ```
 2. Clone the repository:
    ```shell script
@@ -229,7 +227,7 @@ Requirements: **Java 21 or later** and **Docker**. Check your current version of
    ```
 3. See Spellsource-specific tasks using `./gradlew tasks --group spellsource`.
 4. Run tests using `./gradlew test`
-5. Start a local server using `./gradlew run`. This will download about 9GB of content.
+5. Start a local server using `./gradlew runServer`.
 
 macOS requires larger receive buffer limits:
 
@@ -251,11 +249,17 @@ Increase the `allprojects.version` in `build.gradle`, then merge into the `maste
 **Windows**
 
 ```shell
-if ! grep -q "\[merge \"unityyamlmerge\"\]" .git/modules/unityclient/config; then
-    echo -e "[merge \"unityyamlmerge\"]\ndriver = 'C:/Program Files/Unity/Hub/Editor/6000.0.27f1/Editor/Data/Tools/UnityYamlMerge.exe' merge -h -p --force %O %B %A %A\nname = Unity SmartMerge (UnityYamlMerge)\nrecursive = binary" >> .git/modules/unityclient/config
-else
-    echo "Merge tool configuration already exists."
-fi
+git config --local merge.unityyamlmerge.driver "'C:/Program Files/Unity/Hub/Editor/6000.2.0b7/Editor/Data/Tools/UnityYamlMerge.exe' merge --fallback none -h -p --force %O %B %A %A"
+git config --local merge.unityyamlmerge.name "Unity SmartMerge (UnityYamlMerge)"
+git config --local merge.unityyamlmerge.recursive binary
+```
+
+**macOS**
+
+```shell
+git config --local merge.unityyamlmerge.driver "'/Applications/Unity/Hub/Editor/6000.2.0b7/Unity.app/Contents/Tools/UnityYAMLMerge' merge --fallback none -h -p --force %O %B %A %A"
+git config --local merge.unityyamlmerge.name "Unity SmartMerge (UnityYamlMerge)"
+git config --local merge.unityyamlmerge.recursive binary
 ```
 
 ### Troubleshooting

README.md

@@ -5,7 +5,6 @@ import groovy.json.JsonSlurper
 
 buildscript {
   repositories {
-    maven { url "file://${rootDir}/mavenRepository" }
     mavenCentral()
   }
 }
@@ -29,7 +28,6 @@ allprojects {
 
 subprojects {
   repositories {
-    maven { url "file://${rootDir}/mavenRepository" }
     mavenCentral()
     maven { url 'https://jitpack.io' }
   }
@@ -205,6 +203,18 @@ subprojects {
         if (details.requested.group == 'org.objenesis') {
           details.useVersion '3.4'
         }
+        
+        if (details.requested.group == 'com.graphql-java' && details.requested.name == 'graphql-java') {
+          details.useVersion '20.1'
+        }
+        
+        if (details.requested.group == 'org.apache.commons' && details.requested.name == 'commons-lang3') {
+          details.useVersion '3.13.0'
+        }
+        
+        if (details.requested.group == 'org.wildfly.common' && details.requested.name == 'wildfly-common') {
+          details.useVersion '1.5.1.Final'
+        }
       }
     }
   }
@@ -333,15 +343,17 @@ def packageJson = new JsonSlurper().parseText(file('package.json').text)
 def yarnVersionStr = (packageJson.packageManager as String).split("@")[1]
 def binExt = isWindows ? ".cmd" : ""
 
-tasks.register("corepack") {
+tasks.register("corepack", Exec) {
   def dirPath = ".gradle/yarn/yarn-v${yarnVersionStr}/${isWindows ? "" : "/bin"}"
+  def path = "corepack${binExt}"
+  if (isMacOs) {
+    path = "/opt/homebrew/bin/corepack"
+  }
   outputs.dir(dirPath)
-  doLast {
+  doFirst {
     mkdir(dirPath)
-    exec {
-      commandLine "corepack${binExt}", "enable", "--install-directory", dirPath
-    }
   }
+  commandLine path, "enable", "--install-directory", dirPath
 }
 
 tasks.named("yarnSetup").configure {

build.gradle

@@ -13,10 +13,6 @@ repositories {
 }
 gradlePlugin {
   plugins {
-    nativeImage {
-      id = 'native-image'
-      implementationClass = 'com.spellsource.tasks.GraalPlugin'
-    }
     unity {
       id = 'unity'
       implementationClass = 'com.spellsource.tasks.UnityPlugin'