Skip to content

Commit

Permalink
update to 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
ryderbelserion committed Jun 10, 2023
1 parent 6d16498 commit 5ffdca7
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 70 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
@@ -1,6 +1,6 @@
plugins {
id("paper-plugin")
id("library-plugin")
//id("library-plugin")

id("xyz.jpenilla.run-paper") version "2.0.1"
}
Expand All @@ -24,6 +24,6 @@ tasks {
}

runServer {
minecraftVersion("1.19.4")
minecraftVersion("1.20")
}
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Expand Up @@ -5,7 +5,7 @@ plugins {
repositories {
gradlePluginPortal()

maven("https://repo.crazycrew.us/api/")
maven("https://repo.crazycrew.us/first-party/")
}

dependencies {
Expand Down
94 changes: 37 additions & 57 deletions buildSrc/src/main/kotlin/library-plugin.gradle.kts
Expand Up @@ -5,7 +5,6 @@ plugins {

id("featherpatcher")
id("com.modrinth.minotaur")
//id("io.papermc.hangar-publish-plugin")
}

val isBeta = false
Expand All @@ -29,26 +28,27 @@ val downloads = """
//val commitLog = getGitHistory().joinToString(separator = "") { formatGitLog(it) }

val desc = """
# Release ${rootProject.version}
### Changes
* Changes it from using the CraftItemEvent to PrepareCraftItemEvent
* Added 2 new config options
* `Prevent-Using-Vouchers-In-Recipes.Toggle` which defaults to true, Prevents crafting recipes from being complete when including a voucher.
* `Prevent-Using-Vouchers-In-Recipes.Alert` which defaults to false, Sends a message when an item that is a voucher is in the Crafting Table's 9 slots.
### Commits
## Changes:
* Added 1.20 support.
## API:
* N/A
## Bugs:
* Submit any bugs @ https://github.com/Crazy-Crew/CrazyVouchers/issues
## Commits
<details>
<details>
<summary>Other</summary>
<summary>Other</summary>
</details>
As always, report any bugs @ https://github.com/Crazy-Crew/${rootProject.name}/issues
</details>
As always, report any bugs @ https://github.com/Crazy-Crew/${rootProject.name}/issues
""".trimIndent()

val versions = listOf(
"1.19.4",
"1.20"
)

Expand All @@ -73,6 +73,8 @@ fun formatGitLog(commitLog: String): String {
}
*/

val javaComponent: SoftwareComponent = components["java"]

tasks {
modrinth {
token.set(System.getenv("MODRINTH_TOKEN"))
Expand All @@ -96,54 +98,32 @@ tasks {

changelog.set(desc)
}
}

/*hangarPublish {
publications.register("release") {
publishing {
publications {
create<MavenPublication>("maven") {
groupId = rootProject.group.toString()
artifactId = "${rootProject.name.lowercase()}-api"
version = rootProject.version.toString()

namespace("CrazyCrew", rootProject.name)
version.set(rootProject.version as String)
channel.set(otherType)
changelog.set(desc)
apiKey.set(System.getenv("HANGAR_KEY"))
val file = File("$rootDir/jars")
if (!file.exists()) file.mkdirs()
platforms {
register(Platforms.PAPER) {
jar.set(layout.buildDirectory.file("$file/${rootProject.name}-${rootProject.version}.jar"))
platformVersions.set(versions)
from(javaComponent)
}
}
}
}
*/

publishing {
repositories {
val repo = if (isBeta) "beta" else "releases"
maven("https://repo.crazycrew.us/$repo") {
name = "crazycrew"
//credentials(PasswordCredentials::class)
repositories {
maven {
credentials {
this.username = System.getenv("gradle_username")
this.password = System.getenv("gradle_password")
}

credentials {
username = System.getenv("REPOSITORY_USERNAME")
password = System.getenv("REPOSITORY_PASSWORD")
}
}
}

publications {
create<MavenPublication>("maven") {
groupId = rootProject.group.toString()
artifactId = "${rootProject.name.lowercase()}-api"
version = rootProject.version.toString()
if (rootProject.version.toString().contains("SNAPSHOT")) {
url = uri("https://repo.crazycrew.us/snapshots/")
return@maven
}

from(components["java"])
url = uri("https://repo.crazycrew.us/releases/")
}
}
}
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/paper-plugin.gradle.kts
Expand Up @@ -11,7 +11,7 @@ repositories {
}

dependencies {
paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT")
paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
}

tasks {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/root-plugin.gradle.kts
Expand Up @@ -12,7 +12,7 @@ repositories {

maven("https://repo.triumphteam.dev/snapshots/")

maven("https://repo.crazycrew.us/api/")
maven("https://repo.crazycrew.us/first-party/")

maven("https://jitpack.io/")

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -4,5 +4,5 @@ org.gradle.warning.mode = all

name = CrazyVouchers
group = com.badbones69.crazyvouchers
version = 2.9.14.4
version = 2.9.14.5
description = Want to make a paper that can give you an axolotl with a pretty firework display, Look no further!
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
@@ -1,12 +1,12 @@
[libraries]

# Minecraft
papermc = { module = "io.papermc.paper:paper-api", version = "1.19.4-R0.1-SNAPSHOT" }
papermc = { module = "io.papermc.paper:paper-api", version = "1.20-R0.1-SNAPSHOT" }
hangar = { module = "io.papermc:hangar-publish-plugin", version = "0.0.5" }

minotaur = { module = "com.modrinth.minotaur:Minotaur", version = "2.7.2" }
paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version = "1.5.3" }
featherweight = { module = "com.ryderbelserion.feather:feather-plugin", version = "0.0.0.2" }
featherweight = { module = "com.ryderbelserion.feather:feather-plugin", version = "0.0.0.4" }

shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }

Expand All @@ -19,7 +19,7 @@ crazycore = { module = "us.crazycrew.crazycore:crazycore-api", version = "2.0.0.
triumph_cmds = { module = "dev.triumphteam:triumph-cmd-bukkit", version = "2.0.0-SNAPSHOT" }

# Misc
nbt_api = { module = "de.tr7zw:item-nbt-api", version = "2.11.2" }
nbt_api = { module = "de.tr7zw:item-nbt-api", version = "2.11.3" }
bstats_bukkit = { module = "org.bstats:bstats-bukkit", version = "3.0.0" }

# CMI
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/plugin.yml
@@ -1,10 +1,10 @@
name: CrazyVouchers
main: com.badbones69.crazyvouchers.CrazyVouchers
name: 'CrazyVouchers'
main: 'com.badbones69.crazyvouchers.CrazyVouchers'

authors: [BadBones69, RyderBelserion]

version: '2.9.14.4'
api-version: '1.19'
version: '2.9.14.5'
api-version: '1.20'
description: 'Want to make a paper that can give you an axolotl with a pretty firework display, Look no further!'
website: 'https://github.com/Crazy-Crew/CrazyVouchers'

Expand Down

0 comments on commit 5ffdca7

Please sign in to comment.