Skip to content

Commit

Permalink
Major update
Browse files Browse the repository at this point in the history
  • Loading branch information
srnyx committed Aug 1, 2023
1 parent dd485e5 commit 128d768
Show file tree
Hide file tree
Showing 19 changed files with 325 additions and 348 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ko_fi: srnyx
liberapay: srnyx
issuehunt: srnyx
otechie: srnyx
custom: ['https://srnyx.xyz/donate']
custom: ['https://srnyx.com/donate']
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: 🐛 Report a bug
description: Let us know that something clearly doesn't work as expected / described.
labels:
- bug
assignees:
- srnyx
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: 💬 Support
url: https://srnyx.xyz/discord
url: https://srnyx.com/discord
about: "If you need help with the plugin or have a question please join the Discord server and ask there."
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/suggestion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: 💡 Make a suggestion
description: Suggest a change on the current behavior, a completely new feature, or something else.
labels:
- enhancement
assignees:
- srnyx
body:
- type: textarea
attributes:
Expand Down
29 changes: 3 additions & 26 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Build
on:
push:
branches:
- main
- master
paths:
- 'gradle/**'
Expand All @@ -18,25 +14,6 @@ on:

jobs:
build:
runs-on: ubuntu-latest
if: "!contains(github.event.commits[0].message, '[no-build]')"
steps:
- uses: "actions/checkout@v3.1.0"
- uses: "gradle/wrapper-validation-action@v1.0.5"
- name: Set up JDK
uses: "actions/setup-java@v3.9.0"
with:
distribution: temurin
java-version: 17
cache: gradle
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Test with Gradle
run: ./gradlew test
- name: Build jar with Gradle
run: ./gradlew build
- name: Upload artifacts
uses: "actions/upload-artifact@v3.1.1"
with:
name: "Stop Being An Idiot!"
path: build/libs
uses: srnyx/tools/.github/workflows/build.yml@main
with:
name: Stop Being An Idiot!
28 changes: 3 additions & 25 deletions .github/workflows/build_pr.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Build [PR]
on:
pull_request:
Expand All @@ -15,25 +12,6 @@ on:

jobs:
build:
runs-on: ubuntu-latest
if: "!contains(github.event.commits[0].message, '[no-build]')"
steps:
- uses: "actions/checkout@v3.1.0"
- uses: "gradle/wrapper-validation-action@v1.0.5"
- name: Set up JDK
uses: "actions/setup-java@v3.9.0"
with:
distribution: temurin
java-version: 17
cache: gradle
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Test with Gradle
run: ./gradlew test
- name: Build jar with Gradle
run: ./gradlew build
- name: Upload artifacts
uses: "actions/upload-artifact@v3.1.1"
with:
name: "Stop Being An Idiot!"
path: build/libs
uses: srnyx/tools/.github/workflows/build.yml@main
with:
name: Stop Being An Idiot!
14 changes: 14 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Publish
on:
release:
types:
- released
workflow_dispatch:

jobs:
publish:
uses: srnyx/tools/.github/workflows/publish.yml@main
with:
modrinth: CyRCy5Yw
curseforge: 805752
secrets: inherit
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ This plugin makes it so that if one player dies, all other players die as well.
Great plugin for content creation (YouTube, TikTok, Twitch, etc...) or just for a bit of fun with friends.

- **🐛 Bugs / 💡 Suggestions:** Please [open an issue](https://github.com/srnyx/stop-being-an-idiot/issues/new/choose) to report a bug or suggest an idea
- **🆘 Support:** Please [join the Discord](https://srnyx.xyz/discord) to get support
- **🆘 Support:** Please [join the Discord](https://srnyx.com/discord) to get support

## Download

- **✅ Stable:** You can download the latest **stable** version at [Modrinth](https://modrinth.com/plugin/sbai), [Polymart](https://polymart.org/resource/3330), [Spigot](https://spigotmc.org/resources/107313), or [Bukkit](https://dev.bukkit.org/projects/sbai)
- **✅ Stable:** You can download the latest **stable** version at [Modrinth](https://modrinth.com/plugin/sbai), [Hangar](https://hangar.papermc.io/srnyx/StopBeingAnIdiot), [Spigot](https://spigotmc.org/resources/107313), or [Bukkit](https://dev.bukkit.org/projects/sbai)
- **🚧 Snapshot:** You can download the latest **snapshot** version at [actions/workflows/build.yml](https://github.com/srnyx/stop-being-an-idiot/actions/workflows/build.yml)

# Wiki
Expand Down
52 changes: 11 additions & 41 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,46 +1,16 @@
version = "1.0.0"
group = "xyz.srnyx"
import xyz.srnyx.gradlegalaxy.enums.Repository
import xyz.srnyx.gradlegalaxy.enums.repository
import xyz.srnyx.gradlegalaxy.utility.setupAnnoyingAPI
import xyz.srnyx.gradlegalaxy.utility.spigotAPI


plugins {
java
id("com.github.johnrengelman.shadow") version "7.1.2"
}

repositories {
mavenCentral() // org.spigotmc:spigot-api
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") // org.spigotmc:spigot-api
maven("https://oss.sonatype.org/content/repositories/snapshots") // org.spigotmc:spigot-api
maven("https://jitpack.io") // xyz.srnyx:annoying-api
}

dependencies {
compileOnly("org.spigotmc", "spigot-api", "1.11-R0.1-SNAPSHOT")
implementation("xyz.srnyx", "annoying-api", "2.0.3")
id("xyz.srnyx.gradle-galaxy") version "1.1.2"
id("com.github.johnrengelman.shadow") version "8.1.1"
}

tasks {
// Make 'gradle build' run 'gradle shadowJar'
build {
dependsOn("shadowJar")
}

// Remove '-all' from the JAR file name and relocate the AnnoyingAPI package
shadowJar {
archiveClassifier.set("")
relocate("xyz.srnyx.annoyingapi", "xyz.srnyx.stopbeinganidiot.annoyingapi")
}

// Text encoding
compileJava {
options.encoding = "UTF-8"
}

// Replace '${name}' and '${version}'
processResources {
inputs.property("name", project.name)
inputs.property("version", version)
filesMatching("**/plugin.yml") {
expand("name" to project.name, "version" to version)
}
}
}
setupAnnoyingAPI("4.1.0", "xyz.srnyx", "1.0.0", "A fun little game... when one person dies, everyone dies")
spigotAPI("1.8.8")
repository(Repository.PLACEHOLDER_API)
dependencies.compileOnly("me.clip", "placeholderapi", "2.11.3")
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 128d768

Please sign in to comment.