Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.18/dev #284

Merged
merged 5 commits into from
Jun 10, 2024
Merged

1.18/dev #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b84e22
[ci skip] Update build.yml
MichaelHillcox May 1, 2023
09c8daf
fix: map opening via sidebar button requires game stage if needed
desht Jun 10, 2024
7776042
build: version -> 1802.3.18, changelog updated
desht Jun 10, 2024
be29a40
Merge remote-tracking branch 'origin/1.18/dev' into 1.18/dev
desht Jun 10, 2024
40a0dcd
fix: maven publishing details
desht Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ jobs:
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Build and Publish with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v2.4.2
env:
FTB_MAVEN_TOKEN: ${{ secrets.FTB_MAVEN_TOKEN }}
SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
with:
arguments: build publish --stacktrace --no-daemon
- name: Release to CurseForge
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v2.4.2
if: |
contains(github.ref, 'main') && !contains(github.event.head_commit.message, '[norelease]') && github.event.inputs.norelease != 'true'
env:
GIT_COMMIT: ${{ github.event.after }}
GIT_PREVIOUS_COMMIT: ${{ github.event.before }}
CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
with:
arguments: build curseforge --stacktrace --no-daemon
arguments: build curseforge --stacktrace --no-daemon
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1802.3.18]

### Fixed
* Fixed the sidebar map buttons ignoring any GameStages restrictions in force

## [1802.3.17]

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ publishing {
repositories {
if (ENV.FTB_MAVEN_TOKEN) {
maven {
url "https://maven.ftb.dev/release"
url "https://maven.ftb.dev/releases"
credentials {
username = "ftb"
password = "${ENV.FTB_MAVEN_TOKEN}"
Expand All @@ -48,7 +48,7 @@ publishing {

if (ENV.SAPS_TOKEN) {
maven {
url "https://maven.saps.dev/minecraft"
url "https://maven.saps.dev/releases"
credentials {
username = "ftb"
password = "${ENV.SAPS_TOKEN}"
Expand Down
8 changes: 5 additions & 3 deletions common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,11 @@ public boolean skipBlock(BlockState state) {
}

public EventResult customClick(CustomClickEvent event) {
if (event.id().equals(BUTTON_ID)) {
openGui();
return EventResult.interruptTrue();
if (FTBChunksWorldConfig.playerHasMapStage(Minecraft.getInstance().player)) {
if (event.id().equals(BUTTON_ID)) {
openGui();
return EventResult.interruptTrue();
}
}

return EventResult.pass();
Expand Down
4 changes: 2 additions & 2 deletions fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ publishing {
repositories {
if (ENV.FTB_MAVEN_TOKEN) {
maven {
url "https://maven.ftb.dev/release"
url "https://maven.ftb.dev/releases"
credentials {
username = "ftb"
password = "${ENV.FTB_MAVEN_TOKEN}"
Expand All @@ -140,7 +140,7 @@ publishing {

if (ENV.SAPS_TOKEN) {
maven {
url "https://maven.saps.dev/minecraft"
url "https://maven.saps.dev/releases"
credentials {
username = "ftb"
password = "${ENV.SAPS_TOKEN}"
Expand Down
4 changes: 2 additions & 2 deletions forge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ publishing {
repositories {
if (ENV.FTB_MAVEN_TOKEN) {
maven {
url "https://maven.ftb.dev/release"
url "https://maven.ftb.dev/releases"
credentials {
username = "ftb"
password = "${ENV.FTB_MAVEN_TOKEN}"
Expand All @@ -157,7 +157,7 @@ publishing {

if (ENV.SAPS_TOKEN) {
maven {
url "https://maven.saps.dev/minecraft"
url "https://maven.saps.dev/releases"
credentials {
username = "ftb"
password = "${ENV.SAPS_TOKEN}"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mod_id=ftbchunks
archives_base_name=ftb-chunks
minecraft_version=1.18.2
# Build time
mod_version=1802.3.17
mod_version=1802.3.18
maven_group=dev.ftb.mods
mod_author=FTB Team
# Curseforge publishing
Expand Down
Loading