Merge pull request #142 from FTBTeam/1.20.1/dev

1.20.1/dev
FTBTeam · Apr 15, 2024 · 79a22fb · 79a22fb
2 parents 1dc9370 + 5322293
commit 79a22fb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git 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:

diff --git 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/build.gradle b/build.gradle
@@ -40,6 +40,7 @@ allprojects {
 	}
 
 	repositories {
+		mavenLocal()
 		maven {
 			url "https://maven.architectury.dev/"
 		}

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
@@ -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<BlockPos> 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) {

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ allprojects { @@
     	}
     	repositories {
+    		mavenLocal()
     		maven {
     			url "https://maven.architectury.dev/"
     		}
@@ Expand Down @@