From 58bc729edaba35d3b74eb101b06e25a22ebe116a Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Wed, 3 Jan 2024 15:44:08 +0000 Subject: [PATCH 1/4] ci: build on "1.**" branch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d4d795..ec67c57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Java CI - Build on Push on: push: - branches: [ main, dev, "1.*" ] + branches: [ main, dev, "1.**" ] workflow_dispatch: inputs: skip_maven_publish: From 348f7790308ffc8318abb9f38a70a1e5b050c133 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Fri, 12 Apr 2024 17:06:18 +0100 Subject: [PATCH 2/4] chore: add autoclose to config screens Does nothing right now, but will be essential for next FTB Library release to avoid uncloseable config screens! --- .../ftb/mods/ftbultimine/client/FTBUltimineClient.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/dev/ftb/mods/ftbultimine/client/FTBUltimineClient.java b/common/src/main/java/dev/ftb/mods/ftbultimine/client/FTBUltimineClient.java index 09b6874..e850e01 100755 --- a/common/src/main/java/dev/ftb/mods/ftbultimine/client/FTBUltimineClient.java +++ b/common/src/main/java/dev/ftb/mods/ftbultimine/client/FTBUltimineClient.java @@ -11,6 +11,7 @@ import dev.architectury.event.events.client.ClientRawInputEvent; import dev.architectury.event.events.client.ClientTickEvent; import dev.architectury.registry.client.keymappings.KeyMappingRegistry; +import dev.ftb.mods.ftblibrary.config.ConfigGroup; import dev.ftb.mods.ftblibrary.config.ui.EditConfigScreen; import dev.ftb.mods.ftbultimine.CooldownTracker; import dev.ftb.mods.ftbultimine.FTBUltimine; @@ -96,11 +97,10 @@ public void setShape(int shapeIdx, List blocks) { @Override public void editConfig(boolean isClientConfig) { - if (isClientConfig) { - new EditConfigScreen(FTBUltimineClientConfig.getConfigGroup()).openGui(); - } else { - new EditConfigScreen(FTBUltimineServerConfig.getConfigGroup()).openGui(); - } + ConfigGroup configGroup = isClientConfig ? + FTBUltimineClientConfig.getConfigGroup() : + FTBUltimineServerConfig.getConfigGroup(); + new EditConfigScreen(configGroup).setAutoclose(true).openGui(); } public void renderInGame(PoseStack stack) { From 30a79ece986bae26851450821cb40d4f0c31fa64 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Fri, 12 Apr 2024 17:06:32 +0100 Subject: [PATCH 3/4] build: add mavenLocal() to build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 15debb0..71eeb4d 100755 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,7 @@ allprojects { } repositories { + mavenLocal() maven { url "https://maven.architectury.dev/" } From 53222934e2a63a675868259e6899117ce0ee6a19 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Fri, 12 Apr 2024 17:08:12 +0100 Subject: [PATCH 4/4] build: version -> 2001.1.5, changelog updated --- CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aca9241..9023512 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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). +## [2001.1.5] + +### Changed +* Minor background change for compatibility with future FTB Library release + * No player-visible change, but will avoid problems with uncloseable config screens with next FTB Library + ## [2001.1.4] ### Added diff --git a/gradle.properties b/gradle.properties index 571fdc8..d2dc7df 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mod_version=2001.1.4 +mod_version=2001.1.5 maven_group=dev.ftb.mods mod_id=ftbultimine archives_base_name=ftb-ultimine