Skip to content

Commit

Permalink
update to 1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ryderbelserion committed May 23, 2024
1 parent fa3df87 commit d037cb5
Show file tree
Hide file tree
Showing 37 changed files with 429 additions and 719 deletions.
141 changes: 0 additions & 141 deletions .github/workflows/build.yml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Publish Release
on:
push:
branches:
- main
workflow_dispatch:
inputs:
logLevel:
description: 'Log Level'
required: false
default: 'warning'

jobs:
publish:
runs-on: ubuntu-latest
if: "!contains(github.event.commits[0].message, '[ci-skip]')"
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v3

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
check-latest: true

- name: Gradle Properties Import.
id: properties
shell: bash
run: cat gradle.properties >> $GITHUB_ENV

- name: Make gradlew executable
run: chmod +x ./gradlew

- name: Assemble
run:
./gradlew assemble --stacktrace

- name: Publish
env:
HANGAR_KEY: ${{ secrets.HANGAR_KEY }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
COMMIT_MESSAGE: ${{ join(github.event.commits.*.message, '<br>* ') }}
run: ./gradlew modrinth publishAllPublicationsToHangar --stacktrace
10 changes: 4 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
## Fixes:
* Fixed an issue with casino crate where you could open a casino crate without the key.
* Temp fix for double message when trying to open a crate with key in off hand. This means for the time being, keys cannot be used in off hand.
* A few changes will be made to how physical crate locations handle keys in the next 2 days in the `dev` branch with 2.1 builds so until then. This is the quicker solution..
## Changes:
* Updated to 1.20.6 paper

## Other:
* [Feature Requests](https://github.com/Crazy-Crew/CrazyCrates/discussions/categories/features)
* [Bug Reports](https://github.com/Crazy-Crew/CrazyCrates/issues)
* [Feature Requests](https://github.com/Crazy-Crew/BlockParticles/discussions/categories/features)
* [Bug Reports](https://github.com/Crazy-Crew/BlockParticles/issues)
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div align="center">

[![crazycrates](https://raw.githubusercontent.com/RyderBelserion/Assets/main/crazycrew/webp/CrazyCratesBanner.webp)](https://modrinth.com/project/blockparticles)
[![blockparticles](https://raw.githubusercontent.com/RyderBelserion/Assets/main/crazycrew/webp/BlockParticlesBanner.webp)](https://modrinth.com/plugin/blockparticles)

[![Contributors][contributors-shield]][contributors-url]
[![Forks][forks-shield]][forks-url]
Expand All @@ -21,7 +21,7 @@
<a href="#"><strong>Explore the docs »</strong></a>
<br />
<br />
<a href="https://github.com/Crazy-Crew/BlockParticles/issues">Report Bug</a>
<a href="https://github.com/Crazy-Crew/BlockParticles/discussions/categories/features">Report Bug</a>
·
<a href="https://github.com/Crazy-Crew/BlockParticles/issues">Request Feature</a>
·
Expand All @@ -48,8 +48,8 @@
</details>

### Resource Page
[![Hangar](https://raw.githubusercontent.com/intergrav/devins-badges/v3/assets/compact/available/hangar_46h.png)](https://hangar.papermc.io/CrazyCrew/BlockParticles)
[![Modrinth](https://raw.githubusercontent.com/intergrav/devins-badges/v3/assets/compact/available/modrinth_46h.png)](https://modrinth.com/project/blockparticles)
~~[![Hangar](https://raw.githubusercontent.com/intergrav/devins-badges/v3/assets/compact/available/hangar_46h.png)](https://hangar.papermc.io/CrazyCrew/BlockParticles)~~
[![Modrinth](https://raw.githubusercontent.com/intergrav/devins-badges/v3/assets/compact/available/modrinth_46h.png)](https://modrinth.com/plugin/blockparticles)

## Getting Started
How to get started with contributing / maintaining your own version of BlockParticles!
Expand Down Expand Up @@ -91,15 +91,15 @@ Distributed under the MIT License. See [`LICENSE`](/LICENSE) for more informatio
[discord-shield]: https://img.shields.io/discord/182615261403283459.svg?style=flat&logo=appveyor
[discord-url]: https://discord.gg/badbones-s-live-chat-182615261403283459

[contributors-shield]: https://img.shields.io/github/contributors/Crazy-Crew/CrazyCrates.svg?style=flat&logo=appveyor
[contributors-url]: https://github.com/Crazy-Crew/CrazyCrates/graphs/contributors
[forks-shield]: https://img.shields.io/github/forks/Crazy-Crew/CrazyCrates.svg?style=flat&logo=appveyor
[forks-url]: https://github.com/Crazy-Crew/CrazyCrates/network/members
[stars-shield]: https://img.shields.io/github/stars/Crazy-Crew/CrazyCrates.svg?style=flat&logo=appveyor
[stars-url]: https://github.com/Crazy-Crew/CrazyCrates/stargazers
[issues-shield]: https://img.shields.io/github/issues/Crazy-Crew/CrazyCrates.svg?style=flat&logo=appveyor
[issues-url]: https://github.com/Crazy-Crew/CrazyCrates/issues
[license-shield]: https://img.shields.io/github/license/Crazy-Crew/CrazyCrates.svg?style=flat&logo=appveyor
[license-url]: https://github.com/Crazy-Crew/CrazyCrates/blob/master/LICENSE

[codefactor-shield]: https://img.shields.io/codefactor/grade/github/crazy-crew/crazycrates/main?style=flat&logo=appveyor
[contributors-shield]: https://img.shields.io/github/contributors/Crazy-Crew/BlockParticles.svg?style=flat&logo=appveyor
[contributors-url]: https://github.com/Crazy-Crew/BlockParticles/graphs/contributors
[forks-shield]: https://img.shields.io/github/forks/Crazy-Crew/BlockParticles.svg?style=flat&logo=appveyor
[forks-url]: https://github.com/Crazy-Crew/BlockParticles/network/members
[stars-shield]: https://img.shields.io/github/stars/Crazy-Crew/BlockParticles.svg?style=flat&logo=appveyor
[stars-url]: https://github.com/Crazy-Crew/BlockParticles/stargazers
[issues-shield]: https://img.shields.io/github/issues/Crazy-Crew/BlockParticles.svg?style=flat&logo=appveyor
[issues-url]: https://github.com/Crazy-Crew/BlockParticles/issues
[license-shield]: https://img.shields.io/github/license/Crazy-Crew/BlockParticles.svg?style=flat&logo=appveyor
[license-url]: https://github.com/Crazy-Crew/BlockParticles/blob/master/LICENSE

[codefactor-shield]: https://img.shields.io/codefactor/grade/github/crazy-crew/blockparticles/main?style=flat&logo=appveyor
54 changes: 39 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
import git.formatLog
import git.latestCommitHash
import git.latestCommitMessage
import com.ryderbelserion.feather.tools.formatLog
import com.ryderbelserion.feather.tools.latestCommitHash
import com.ryderbelserion.feather.tools.latestCommitMessage

plugins {
id("io.papermc.hangar-publish-plugin") version "0.1.2"
id("com.modrinth.minotaur") version "2.+"
alias(libs.plugins.minotaur)
alias(libs.plugins.hangar)

id("io.github.goooler.shadow")

`root-plugin`
`java-plugin`
}

val buildNumber: String? = System.getenv("NEXT_BUILD_NUMBER")

rootProject.version = if (buildNumber != null) "1.0-$buildNumber" else "1.0"
val buildNumber: String = System.getenv("NEXT_BUILD_NUMBER") ?: "SNAPSHOT"

val isSnapshot = false

rootProject.version = if (isSnapshot) "1.0-$buildNumber" else "1.2"

val content: String = if (isSnapshot) {
formatLog(latestCommitHash(), latestCommitMessage(), rootProject.name)
formatLog(latestCommitHash(), latestCommitMessage(), rootProject.name, "Crazy-Crew")
} else {
rootProject.file("CHANGELOG.md").readText(Charsets.UTF_8)
}
Expand All @@ -32,7 +30,7 @@ modrinth {

projectId.set(rootProject.name.lowercase())

versionType.set("beta")
versionType.set(if (isSnapshot) "beta" else "release")

versionName.set("${rootProject.name} ${rootProject.version}")
versionNumber.set(rootProject.version as String)
Expand All @@ -51,6 +49,10 @@ modrinth {

autoAddDependsOn.set(false)
detectLoaders.set(false)

//dependencies {
// optional.version("fancyholograms", "2.0.6")
//}
}

hangarPublish {
Expand All @@ -61,9 +63,9 @@ hangarPublish {

version.set(rootProject.version as String)

channel.set("Snapshot")
channel.set(if (isSnapshot) "Snapshot" else "Release")

changelog.set(System.getenv("COMMIT_MESSAGE"))
changelog.set(content)

platforms {
paper {
Expand All @@ -72,6 +74,28 @@ hangarPublish {
platformVersions.set(listOf(
"1.20.6"
))

dependencies {
hangar("PlaceholderAPI") {
required = false
}

//hangar("FancyHolograms") {
// required = false
//}

url("Oraxen", "https://www.spigotmc.org/resources/%E2%98%84%EF%B8%8F-oraxen-custom-items-blocks-emotes-furniture-resourcepack-and-gui-1-18-1-20-4.72448/") {
required = false
}

url("CMI", "https://www.spigotmc.org/resources/cmi-298-commands-insane-kits-portals-essentials-economy-mysql-sqlite-much-more.3742/") {
required = false
}

url("DecentHolograms", "https://www.spigotmc.org/resources/decentholograms-1-8-1-20-4-papi-support-no-dependencies.96927/") {
required = false
}
}
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import com.ryderbelserion.feather.feather

plugins {
`kotlin-dsl`
}
id("com.ryderbelserion.feather-logic") version "0.0.1"

repositories {
gradlePluginPortal()
mavenCentral()
`kotlin-dsl`
}

dependencies {
implementation("io.papermc.paperweight", "paperweight-userdev", "1.6.2")
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

implementation("io.github.goooler.shadow", "shadow-gradle-plugin", "8.1.7")}
feather("0.0.1")
}
Loading

0 comments on commit d037cb5

Please sign in to comment.