Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improvements #42

Merged
merged 11 commits into from
Jul 17, 2022
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -70,4 +79,4 @@

## [0.0.1]
### Added
- Initial version.
- Initial version.
3 changes: 2 additions & 1 deletion bin/commands/new.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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;
Expand Down
19 changes: 14 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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",
Expand Down Expand Up @@ -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()
Expand Down
8 changes: 8 additions & 0 deletions distributions/paper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"versions": [
{
"version": "1.19",
"java": {
"min": 17,
"max": 18
},
"recommendedFlags": "aikar"
},
{
"version": "1.18.2",
"java": {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions lib/distributions/distribution.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -15,7 +14,6 @@ abstract class Distribution {
WaterfallDistribution(),
TravertineDistribution(),
PurPurDistribution(),
NyperDistribution(),
VelocityDistribution(),
BungeeCordDistribution()
];
Expand Down
5 changes: 3 additions & 2 deletions lib/distributions/metadata/distribution_api.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions lib/distributions/nyper/nyper_api.dart

This file was deleted.

92 changes: 0 additions & 92 deletions lib/distributions/nyper/nyper_api.g.dart

This file was deleted.

54 changes: 0 additions & 54 deletions lib/distributions/nyper/nyper_distribution.dart

This file was deleted.

29 changes: 17 additions & 12 deletions lib/distributions/paper/paper_api.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.