Skip to content

Commit

Permalink
Merge pull request #86 from Crazy-Crew/dev
Browse files Browse the repository at this point in the history
A few more plugin enhancements here & there.
  • Loading branch information
ryderbelserion committed Mar 21, 2023
2 parents 0190c41 + e6c246b commit 3eb589d
Show file tree
Hide file tree
Showing 33 changed files with 354 additions and 288 deletions.
88 changes: 88 additions & 0 deletions .github/ISSUE_TEMPLATE/bugs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "Bug Report"
description: "Create a report to help us improve the plugin."
title: "[Bug Report]: "
labels: ["bug"]

assignees:
- ryderbelserion

body:
- type: markdown
attributes:
value: |
Note: Search to see if an issue already exists for the bug you are reporting.
What plugin version are you on? Type /version `plugin-name`
Add any gif / imgur links if need be. Markdown is supported!
If you have any large stack traces / errors, Please use https://mclo.gs/
Spark Profiler > https://spark.lucko.me/download
- type: input
attributes:
label: Spark link
description: We ask that Spark profilings are shared through a link, not a screenshot. Screenshots inhibit our ability to figure out the real cause of the issue.
placeholder: Output of /spark profiler --timeout 300
validations:
required: false
- type: dropdown
id: version
attributes:
label: Server Version
description: What server version are you on?
options:
- 1.8.8
- 1.12.2
- 1.16.5
- 1.19.3
validations:
required: true
- type: dropdown
id: platform
attributes:
label: Server Platform
description: What server platform are you using?
options:
- Spigot
- Paper
- Purpur
validations:
required: true
- type: textarea
id: bug
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. Go to '...'
2. Change value in placeholder.yml '...'
3. Run command '...'
4. See error
validations:
required: true
- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context about the problem here.
validations:
required: false
- type: checkboxes
attributes:
label: Agreements
description: Please agree to the following.
options:
- label: I have searched for and ensured there isn't already an open issue regarding this.
required: true
- label: I ticked all the boxes without actually reading them
required: false
- label: My version of Minecraft is supported by CrazyCrew.
required: true
8 changes: 7 additions & 1 deletion .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
#- dev
workflow_dispatch:
inputs:
logLevel:
Expand Down Expand Up @@ -41,4 +42,9 @@ jobs:
run: ./gradlew publish --stacktrace
env:
REPOSITORY_USERNAME: ${{ secrets.CRAZYCREW_USERNAME }}
REPOSITORY_PASSWORD: ${{ secrets.CRAZYCREW_PASSWORD }}
REPOSITORY_PASSWORD: ${{ secrets.CRAZYCREW_PASSWORD }}
- name: Update Notification
run: |
./gradlew webhook --stacktrace
env:
DISCORD_WEBHOOK: ${{ secrets.CRAZYCREW_WEBHOOK }}
12 changes: 5 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
.gradle
.idea

build

build-logic/.gradle
build-logic/build

core/build
buildSrc/.gradle
buildSrc/build

platforms/paper/build
platforms/paper/run/*
Expand All @@ -15,4 +11,6 @@ platforms/paper/run/*
!platforms/paper/run/bukkit.yml
!platforms/paper/run/spigot.yml
!platforms/paper/run/server.properties
!platforms/paper/run/config
!platforms/paper/run/config

build
19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<br />

[![CrazyEnvoys](https://raw.githubusercontent.com/RyderBelserion/Assets/main/crazycrew/new/crazyenvoys/Banner.png)](https://modrinth.com/plugin/crazyenvoys)
[![CrazyEnvoys](https://git.crazycrew.us/ryderbelserion/Assets/raw/branch/main/crazycrew/webp/CrazyEnvoysBanner.webp)](https://modrinth.com/plugin/crazyenvoys)

<div align="center">

Expand All @@ -23,9 +23,9 @@
<br />
<a href="https://github.com/Crazy-Crew/CrazyEnvoys/issues">Report Bug</a>
·
<a href="https://github.com/Crazy-Crew/CrazyEnvoys/discussions/categories/feature-rquests">Request Feature</a>
<a href="https://github.com/Crazy-Crew/CrazyEnvoys/discussions/categories/feature-requests">Request Feature</a>
·
<a href="https://github.com/Crazy-Crew/CrazyEnvoys/discussions/categories/support">Get Support</a>
<a href="https://discord.gg/crazycrew">Get Support</a>
</p>
</div>

Expand All @@ -47,13 +47,12 @@
</ol>
</details>

## Downloads
> https://modrinth.com/plugin/crazyenvoys
## Resource Page

## Beta Builds
### Get the latest changes before marked as release.
All beta builds will be on Modrinth.<br>
> https://modrinth.com/plugin/crazyenvoys/versions
### Beta Builds
All beta builds will be on Modrinth marked as beta.<br>

<a href="https://modrinth.com/plugin/crazyenvoys">![Modrinth](https://raw.githubusercontent.com/intergrav/devins-badges/v3/assets/cozy/available/modrinth_64h.png)</a>

## Getting Started

Expand Down Expand Up @@ -88,7 +87,7 @@ Check our public [trello board](https://trello.com/b/BGDNUdaj) for our current p
2. Create your Feature Branch (`git checkout -b feature/yourfeature`)
3. Commit your Changes (`git commit -m 'your amazing feature.'`)
4. Push to the Branch (`git push`)
5. Open a Pull Request to add your feature/fix.
5. Open a Pull Request to the dev branch to add your feature/fix.

## License

Expand Down
20 changes: 0 additions & 20 deletions build-logic/build.gradle.kts

This file was deleted.

11 changes: 0 additions & 11 deletions build-logic/settings.gradle.kts

This file was deleted.

28 changes: 0 additions & 28 deletions build-logic/src/main/kotlin/crazyenvoys.base-plugin.gradle.kts

This file was deleted.

28 changes: 0 additions & 28 deletions build-logic/src/main/kotlin/crazyenvoys.root-plugin.gradle.kts

This file was deleted.

32 changes: 13 additions & 19 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,52 +1,46 @@
import task.WebhookExtension
import java.awt.Color

plugins {
id("crazyenvoys.root-plugin")
}

val legacyUpdate = Color(255, 73, 110)
val releaseUpdate = Color(27, 217, 106)
val betaUpdate = Color(255, 163, 71)

val isBeta = settings.versions.projectBeta.get().toBoolean()
val projectVersion = settings.versions.projectVersion.get()
val projectName = settings.versions.projectName.get()
val projectExt = settings.versions.projectExtension.get()
val beta = settings.versions.beta.get().toBoolean()
val extension = settings.versions.extension.get()

val finalVersion = if (isBeta) "$projectVersion+Beta" else projectVersion

val projectNameLowerCase = projectName.toLowerCase()

val color = if (isBeta) betaUpdate else releaseUpdate
val repo = if (isBeta) "beta" else "releases"
val color = if (beta) betaUpdate else releaseUpdate
val repo = if (beta) "beta" else "releases"

webhook {
this.avatar("https://cdn.discordapp.com/avatars/209853986646261762/eefe3c03882cbb885d98107857d0b022.png?size=4096")
this.avatar("https://en.gravatar.com/avatar/${WebhookExtension.Gravatar().md5Hex("no-reply@ryderbelserion.com")}.jpeg")

this.username("Ryder Belserion")

this.content("New version of $projectName is ready! <@&929463450214735912>")
this.content("New version of ${rootProject.name} is ready! <@&1029922295210311681>")

this.embeds {
this.embed {
this.color(color)

this.fields {
this.field(
"Version $finalVersion",
"Download Link: https://modrinth.com/$projectExt/$projectNameLowerCase/version/$finalVersion"
"Version ${rootProject.version}",
"Download Link: https://modrinth.com/$extension/${rootProject.name.lowercase()}/version/${rootProject.version}"
)

this.field(
"API Update",
"Version $finalVersion has been pushed to https://repo.crazycrew.us/#/$repo"
"Version ${rootProject.version} has been pushed to https://repo.crazycrew.us/#/$repo"
)
}

this.author(
projectName,
"https://modrinth.com/$projectExt/$projectNameLowerCase/versions",
"https://cdn-raw.modrinth.com/data/mqwRS0rH/527c23235d3bf4aa8ca1619b763c618b6c198109.png"
rootProject.name,
"https://modrinth.com/$extension/${rootProject.name.lowercase()}/versions",
"https://cdn-raw.modrinth.com/data/EMORKQjj/1cf7fffa9bf92d1bc292983dc320984cc764b51e.png"
)
}
}
Expand Down
23 changes: 23 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
plugins {
`kotlin-dsl`
}

repositories {
gradlePluginPortal()
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
implementation("com.github.johnrengelman:shadow:8.1.0")

// For the webhook tasks, this applies to the buildSrc only
val ktor = "2.2.4"

implementation("io.ktor:ktor-client-core-jvm:$ktor")
implementation("io.ktor:ktor-client-cio-jvm:$ktor")
implementation("io.ktor:ktor-client-content-negotiation:$ktor")
implementation("io.ktor:ktor-serialization-gson:$ktor")

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
}
3 changes: 3 additions & 0 deletions buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependencyResolutionManagement {
repositories.gradlePluginPortal()
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ plugins {
}

repositories {
/**
* Paper Team
*/
maven("https://repo.papermc.io/repository/maven-public/")

/**
Expand Down

0 comments on commit 3eb589d

Please sign in to comment.