Merge pull request #284 from FTBTeam/1.18/dev

1.18/dev
FTBTeam · Jun 10, 2024 · 1256f09 · 1256f09
2 parents 24a4a36 + 40a0dcd
commit 1256f09
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/common/build.gradle b/common/build.gradle
@@ -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}"
@@ -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}"

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java
@@ -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();

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -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}"
@@ -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}"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -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}"
@@ -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}"

diff --git a/gradle.properties b/gradle.properties
@@ -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