Merge pull request #42 from NyCodeGHG/improvements

improvements

CHANGELOG.md

@@ -2,14 +2,23 @@
 
 ## [Unreleased]
 ### Added
+- Metadata for 1.19
 
 ### Changed
+- Update gradle wrapper to 7.4.2
+- Now using New Purpur API URL
+- Recommending Velocity over Waterfall
+- Showing latest minecraft versions at the top
+- Ignoring symlinked jdks
 
 ### Deprecated
 
 ### Removed
+- Nyper Support
 
 ### Fixed
+- Fixed missing metadata crash (See #41)
+- Unix Script Permissions
 
 ### Security
 
@@ -70,4 +79,4 @@
 
 ## [0.0.1]
 ### Added
-- Initial version.
+- Initial version.

bin/commands/new.dart

@@ -1,4 +1,5 @@
 import 'package:args/args.dart';
+import 'package:collection/collection.dart';
 import 'package:file/file.dart';
 import 'package:interact/interact.dart';
 import 'package:logging/logging.dart';
@@ -62,7 +63,7 @@ class NewCommand extends Command with YesFlag, JvmOption, VersionOption {
         ? (await _metadata.getDistributionMetaData(distribution.metadataKey))
         : null;
     final versionMeta =
-        meta?.versions.firstWhere((element) => element.version == version);
+        meta?.versions.firstWhereOrNull((element) => element.version == version);
     final useRecommendedFlags = versionMeta?.recommendedFlagKey != null
         ? globalConfirm(localizations.useAikarFlags, defaultValue: true)
         : false;

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     id("org.jetbrains.changelog") version "1.3.1"
 }
 
-version = "0.1.3"
+version = "0.2.0"
 
 changelog {
     version.set(project.version.toString())
@@ -23,26 +23,34 @@ changelog {
 
 tasks {
     register<Exec>("dartPubGet") {
-        dart("pub", "get")
+        dart("dart", "pub", "get")
     }
 
     val dartGenerate = register<Exec>("dartGenerate") {
-        dart("pub", "run", "build_runner", "build", "--delete-conflicting-outputs")
+        dart("dart", "pub", "run", "build_runner", "build", "--delete-conflicting-outputs")
 
         inputs.dir(project.file("bin"))
         inputs.dir(project.file("lib"))
         outputs.dirs(inputs.files)
     }
 
     register<Exec>("dartBuildArb") {
-        dart("pub", "run", "intl_translation:extract_to_arb", "--output-dir=i18n", "lib/intl/localizations.dart")
+        dart(
+            "dart",
+            "pub",
+            "run",
+            "intl_translation:extract_to_arb",
+            "--output-dir=i18n",
+            "lib/intl/localizations.dart"
+        )
 
         inputs.file("lib/intl/localizations.dart")
         outputs.dirs("i18n")
     }
 
     register<Exec>("dartReadArb") {
         dart(
+            "dart",
             "pub",
             "run",
             "intl_translation:generate_from_arb",
@@ -83,7 +91,8 @@ tasks {
     }
 
     val dartBuild = register<Exec>("dartBuild") {
-        val fileName = if (System.getProperty("os.name").startsWith("Windows")) "mcserv.exe" else "mcserv"
+        val fileName =
+            if (System.getProperty("os.name").startsWith("Windows")) "mcserv.exe" else "mcserv"
         val destinationDir = project.buildDir.resolve("dart")
         doFirst {
             destinationDir.mkdirs()

distributions/paper.json

@@ -1,5 +1,13 @@
 {
   "versions": [
+    {
+      "version": "1.19",
+      "java": {
+        "min": 17,
+        "max": 18
+      },
+      "recommendedFlags": "aikar"
+    },
     {
       "version": "1.18.2",
       "java": {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/distributions/distribution.dart

@@ -1,5 +1,4 @@
 import 'package:file/file.dart';
-import 'package:mcserv/distributions/nyper/nyper_distribution.dart';
 import 'package:mcserv/distributions/pl3x/purpur_distribution.dart';
 import 'package:mcserv/distributions/plain/bungeecord_distribution.dart';
 import 'package:meta/meta.dart';
@@ -15,7 +14,6 @@ abstract class Distribution {
     WaterfallDistribution(),
     TravertineDistribution(),
     PurPurDistribution(),
-    NyperDistribution(),
     VelocityDistribution(),
     BungeeCordDistribution()
   ];