Skip to content

Commit 04f7814

Browse files
Revert "Merge remote-tracking branch 'origin/crossplay'"
This reverts commit dedb2bc, reversing changes made to f1b4652.
1 parent 6abb355 commit 04f7814

30 files changed

+30
-2046
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ frontend/build
2323
### Matches should be ignored
2424
/matches/
2525

26-
### Cross-play temp files
27-
/crossplay_temp/
28-
2926
### Java
3027
*.classpath
3128
*.project

build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ task headless(type: JavaExec, dependsOn: [':engine:build', ':example-bots:build'
7878
'-Dbc.engine.show-indicators=' + (project.findProperty('showIndicators') ?: 'true'),
7979
'-Dbc.game.team-a=' + project.property('teamA'),
8080
'-Dbc.game.team-b=' + project.property('teamB'),
81-
'-Dbc.game.team-a.language=' + (project.findProperty('languageA') ?: 'java'),
82-
'-Dbc.game.team-b.language=' + (project.findProperty('languageB') ?: 'java'),
8381
'-Dbc.game.team-a.url=' + (project.findProperty('classLocationA') ?: defaultClassLocation),
8482
'-Dbc.game.team-b.url=' + (project.findProperty('classLocationB') ?: defaultClassLocation),
8583
'-Dbc.game.team-a.package=' + (project.findProperty('packageNameA') ?: project.property('teamA')),
@@ -91,10 +89,6 @@ task headless(type: JavaExec, dependsOn: [':engine:build', ':example-bots:build'
9189
]
9290
}
9391

94-
task crossPlayPy(type: Exec, dependsOn: [':engine:build']) {
95-
commandLine 'python', 'engine/src/crossplay_python/main.py', '--teamA', project.property('teamA'), '--teamB', project.property('teamB')
96-
}
97-
9892
// keep the client happy because it references this step
9993
task unpackClient() {}
10094

engine/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ dependencies {
5353
// We only use WeakIdentityHashMap which doesn't depend on anything
5454
[group: 'org.hibernate', name: 'hibernate-search', version: '3.1.0.GA'],
5555

56+
// Java Spatial Index, RTree indexing
57+
// The official Maven repositories do not host net.sourceforge.jsi:jsi.
58+
// There are no valid released versions on Maven Central or Sonatype.
59+
// If you need JSI, download jsi-1.0.jar manually and use:
5660
[group: 'net.sf.trove4j', name: 'trove4j', version: '2.1.0'],
57-
58-
[group: 'org.json', name: 'json', version: '20250517'],
5961
)
6062
// implementation files('lib/jsi-1.0.jar')
6163

engine/src/battlecode.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

engine/src/crossplay_python/crossplay.py

Lines changed: 0 additions & 331 deletions
This file was deleted.

0 commit comments

Comments
 (0)