Commits
md_5 authored 8e8a5815ecf
| 471 471 | { |
| 472 472 | download( versionInfo.getMappingsUrl(), mojangMappings ); |
| 473 473 | } |
| 474 474 | |
| 475 475 | MapUtil mapUtil = new MapUtil(); |
| 476 476 | mapUtil.loadBuk( classMappings ); |
| 477 477 | if ( !memberMappings.exists() ) |
| 478 478 | { |
| 479 479 | memberMappings = new File( workDir, "bukkit-" + mappingsVersion + "-members.csrg" ); |
| 480 480 | mapUtil.makeFieldMaps( mojangMappings, memberMappings, true ); |
| 481 + | } else if ( !fieldMappings.exists() ) |
| 482 + | { |
| 483 + | mapUtil.makeFieldMaps( mojangMappings, fieldMappings, false ); |
| 484 + | } |
| 481 485 | |
| 486 + | // 1.18 |
| 487 + | if ( memberMappings.exists() ) |
| 488 + | { |
| 482 489 | runMaven( CWD, "install:install-file", "-Dfile=" + memberMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 483 490 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot-members", "-DgeneratePom=false" ); |
| 491 + | } |
| 484 492 | |
| 493 + | // 1.18 |
| 494 + | if ( classMappings.exists() ) |
| 495 + | { |
| 485 496 | runMaven( CWD, "install:install-file", "-Dfile=" + classMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 486 497 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" ); |
| 487 - | } else if ( !fieldMappings.exists() ) |
| 488 - | { |
| 489 - | mapUtil.makeFieldMaps( mojangMappings, fieldMappings, false ); |
| 498 + | } |
| 490 499 | |
| 500 + | // 1.17 |
| 501 + | if ( fieldMappings.exists() ) |
| 502 + | { |
| 491 503 | runMaven( CWD, "install:install-file", "-Dfile=" + fieldMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 492 504 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot-fields", "-DgeneratePom=false" ); |
| 493 505 | |
| 494 506 | File combinedMappings = new File( workDir, "bukkit-" + mappingsVersion + "-combined.csrg" ); |
| 495 507 | if ( !combinedMappings.exists() ) |
| 496 508 | { |
| 497 509 | mapUtil.makeCombinedMaps( combinedMappings, memberMappings ); |
| 498 510 | } |
| 499 511 | |
| 500 512 | runMaven( CWD, "install:install-file", "-Dfile=" + combinedMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 501 513 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" ); |
| 502 514 | } |
| 503 515 | |
| 516 + | // 1.17+ |
| 504 517 | runMaven( CWD, "install:install-file", "-Dfile=" + mojangMappings, "-Dpackaging=txt", "-DgroupId=org.spigotmc", |
| 505 518 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-mojang", "-DgeneratePom=false" ); |
| 506 519 | } |
| 507 520 | |
| 508 521 | File clMappedJar = new File( finalMappedJar + "-cl" ); |
| 509 522 | File mMappedJar = new File( finalMappedJar + "-m" ); |
| 510 523 | |
| 511 524 | if ( versionInfo.getClassMapCommand() == null ) |
| 512 525 | { |
| 513 526 | versionInfo.setClassMapCommand( "java -jar BuildData/bin/SpecialSource-2.jar map -i {0} -m {1} -o {2}" ); |