Commits
md_5 authored e350a4449c2
| 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 481 | } else if ( !fieldMappings.exists() ) |
| 482 482 | { |
| 483 483 | mapUtil.makeFieldMaps( mojangMappings, fieldMappings, false ); |
| 484 484 | } |
| 485 485 | |
| 486 - | // 1.18 |
| 486 + | // 1.17+ |
| 487 487 | if ( memberMappings.exists() ) |
| 488 488 | { |
| 489 489 | runMaven( CWD, "install:install-file", "-Dfile=" + memberMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 490 490 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot-members", "-DgeneratePom=false" ); |
| 491 491 | } |
| 492 492 | |
| 493 - | // 1.18 |
| 494 - | if ( classMappings.exists() ) |
| 495 - | { |
| 496 - | runMaven( CWD, "install:install-file", "-Dfile=" + classMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 497 - | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" ); |
| 498 - | } |
| 499 - | |
| 500 493 | // 1.17 |
| 501 494 | if ( fieldMappings.exists() ) |
| 502 495 | { |
| 503 496 | runMaven( CWD, "install:install-file", "-Dfile=" + fieldMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 504 497 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot-fields", "-DgeneratePom=false" ); |
| 505 498 | |
| 506 499 | File combinedMappings = new File( workDir, "bukkit-" + mappingsVersion + "-combined.csrg" ); |
| 507 500 | if ( !combinedMappings.exists() ) |
| 508 501 | { |
| 509 502 | mapUtil.makeCombinedMaps( combinedMappings, memberMappings ); |
| 510 503 | } |
| 511 504 | |
| 512 505 | runMaven( CWD, "install:install-file", "-Dfile=" + combinedMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 513 506 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" ); |
| 507 + | } else |
| 508 + | { |
| 509 + | // 1.18+ |
| 510 + | runMaven( CWD, "install:install-file", "-Dfile=" + classMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc", |
| 511 + | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" ); |
| 514 512 | } |
| 515 513 | |
| 516 514 | // 1.17+ |
| 517 515 | runMaven( CWD, "install:install-file", "-Dfile=" + mojangMappings, "-Dpackaging=txt", "-DgroupId=org.spigotmc", |
| 518 516 | "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-mojang", "-DgeneratePom=false" ); |
| 519 517 | } |
| 520 518 | |
| 521 519 | File clMappedJar = new File( finalMappedJar + "-cl" ); |
| 522 520 | File mMappedJar = new File( finalMappedJar + "-m" ); |
| 523 521 | |