Skip to content

Commit

Permalink
Merge branch '1.16' into 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
Siphalor committed Jun 6, 2021
2 parents b1c7bff + 2a18bfd commit 5058750
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
14 changes: 14 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id 'com.matthewprenger.cursegradle' version '1.4.0'
id 'com.modrinth.minotaur' version '1.2.1'
id 'org.cadixdev.licenser' version '0.5.0'
id 'com.github.breadmoirai.github-release' version '2.2.12'
}

sourceCompatibility = JavaVersion.VERSION_16
Expand Down Expand Up @@ -226,3 +227,16 @@ if (project.hasProperty("siphalorModrinthApi")) {
}
uploadToModSites.finalizedBy(tasks.modrinth)
}

if (project.hasProperty("siphalorGitHubToken")) {
githubRelease {
token siphalorGitHubToken
targetCommitish.set(minecraft_major_version)
releaseName.set("Version $mod_version for $mod_mc_version_specifier")
body.set(getProjectChangelog())
releaseAssets remapJar.getArchiveFile()
prerelease.set(mod_release != "release")
overwrite.set(true)
}
uploadToModSites.finalizedBy(tasks.githubRelease)
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ yarn_build=6:v2
loader_version=0.11.3
# Mod Properties
mod_id=mousewheelie
mod_version=1.7.2
mod_version=1.7.3
mod_release=release
mod_mc_version_specifier=21w19a+
mod_mc_versions=21w19a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public Integer[] sort(Integer[] sortIds, ItemStack[] stacks) {
}
Integer amountA = itemToAmountMap.get(stack.getItem());
Integer amountB = itemToAmountMap.get(stack2.getItem());
return Integer.compare(amountA, amountB);
return Integer.compare(amountB, amountA);
});

return sortIds;
Expand Down

0 comments on commit 5058750

Please sign in to comment.