Commits
Nothixal authored and md_5 committed ae85546c005
| 664 664 | if ( !spigotServer.exists() ) |
| 665 665 | { |
| 666 666 | clone( "file://" + craftBukkit.getAbsolutePath(), spigotServer ); |
| 667 667 | } |
| 668 668 | } |
| 669 669 | |
| 670 670 | // Git spigotApiGit = Git.open( spigotApi ); |
| 671 671 | // Git spigotServerGit = Git.open( spigotServer ); |
| 672 672 | if ( compile == null || compile.isEmpty() ) |
| 673 673 | { |
| 674 - | if ( versionInfo.getToolsVersion() <= 104 || dev ) |
| 674 + | if ( dev ) |
| 675 675 | { |
| 676 676 | compile = Arrays.asList( Compile.CRAFTBUKKIT, Compile.SPIGOT ); |
| 677 677 | } else |
| 678 678 | { |
| 679 679 | compile = Collections.singletonList( Compile.SPIGOT ); |
| 680 680 | } |
| 681 681 | } |
| 682 682 | if ( compile.contains( Compile.CRAFTBUKKIT ) ) |
| 683 683 | { |
| 684 684 | System.out.println( "Compiling Bukkit" ); |
| 745 745 | { |
| 746 746 | suffix = versionInfo.getMinecraftVersion() + experimental + snapshot + bootstrap + fileExtension; |
| 747 747 | finalName = "spigot-" + versionInfo.getMinecraftVersion() + experimental + fileExtension; |
| 748 748 | } |
| 749 749 | |
| 750 750 | if ( outputNameFlag.value( options ) != null ) |
| 751 751 | { |
| 752 752 | finalName = outputNameFlag.value( options ); |
| 753 753 | } |
| 754 754 | |
| 755 - | if ( compile.contains( Compile.CRAFTBUKKIT ) && ( versionInfo.getToolsVersion() < 101 || versionInfo.getToolsVersion() > 104 ) ) |
| 755 + | if ( compile.contains( Compile.CRAFTBUKKIT ) ) |
| 756 756 | { |
| 757 757 | copyJar( "CraftBukkit/target", "craftbukkit", suffix, new File( outputDirFlag.value( options ), "craftbukkit-" + versionInfo.getMinecraftVersion() + ".jar" ) ); |
| 758 758 | } |
| 759 759 | |
| 760 760 | if ( compile.contains( Compile.SPIGOT ) ) |
| 761 761 | { |
| 762 762 | copyJar( "Spigot/Spigot-Server/target", "spigot", suffix, new File( outputDirFlag.value( options ), finalName ) ); |
| 763 763 | } |
| 764 764 | |
| 765 765 | System.exit( 0 ); |