Merge pull request #55 from FTBTeam/dev

Dev
FTBTeam · Aug 15, 2024 · a14b7f6 · a14b7f6
2 parents c3d35bb + 7e5475e
commit a14b7f6
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ 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).
 
+## [2101.1.0]
+
+### Changed
+* Ported to MC 1.21.1
+  * Will not run on MC 1.21
+
+### Added
+* Sidebar buttons for this and other FTB mods can now be enabled/disabled/rearranged (new functionality in FTB Library 2101.1.0)
+
+## [2100.1.0]
+
+### Changed
+* Ported to MC 1.21
+
 ## [2006.1.0]
 
 ### Changed

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
 	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
@@ -106,7 +106,7 @@ publishMods {
 
 	// TODO: Migrate to something else
 	def tag = providers.environmentVariable("TAG").getOrElse("release")
-	type = tag == "beta" ? BETA : (tag == "alpha" ? ALPHA : STABLE)
+	type = tag.endsWith("-beta") ? BETA : (tag.endsWith("-alpha") ? ALPHA : STABLE)
 
 	def createOptions = (String projectName) -> {
 		publishOptions {

diff --git a/common/src/main/java/dev/ftb/mods/ftbteams/data/TeamArgument.java b/common/src/main/java/dev/ftb/mods/ftbteams/data/TeamArgument.java
@@ -98,7 +98,7 @@ public Team getTeam(CommandSourceStack source) throws CommandSyntaxException {
 	@Override
 	public TeamArgumentProvider parse(StringReader reader) throws CommandSyntaxException {
 		if (reader.canRead() && reader.peek() == '@') {
-			EntitySelector selector = new EntitySelectorParser(reader).parse();
+			EntitySelector selector = new EntitySelectorParser(reader, true).parse();
 
 			if (selector.includesEntities()) {
 				throw EntityArgument.ERROR_ONLY_PLAYERS_ALLOWED.create();

diff --git a/common/src/main/resources/assets/ftbteams/sidebar_buttons.json b/common/src/main/resources/assets/ftbteams/sidebar_buttons.json
diff --git a/common/src/main/resources/assets/ftbteams/sidebar_buttons/my_team.json b/common/src/main/resources/assets/ftbteams/sidebar_buttons/my_team.json
@@ -0,0 +1,8 @@
+{
+  "icon": "ftbteams:textures/teams.png",
+  "sort_index": 550,
+  "loading_screen": true,
+  "click": [
+    "ftbteams:open_gui"
+  ]
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -38,7 +38,7 @@ processResources {
 	filesMatching("fabric.mod.json") {
 		expand "version": project.version,
 				"archversion": project.architectury_api_version,
-				"fabricapiversion": project.fabric_api_version,
+				"fabricapiversionrange": project.fabric_api_version_range,
 				"mcversion": project.minecraft_version,
 				"ftblibraryversion": project.ftb_library_version
 	}

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -18,7 +18,7 @@
 		]
 	},
 	"depends": {
-		"fabric": ">=${fabricapiversion}",
+		"fabric": "${fabricapiversionrange}",
 		"minecraft": "~${mcversion}",
 		"architectury": ">=${archversion}",
 		"ftblibrary": ">=${ftblibraryversion}"

diff --git a/gradle.properties b/gradle.properties
@@ -7,20 +7,20 @@ maven_group=dev.ftb.mods
 readable_name=FTB Teams
 mod_author=FTB Team
 
-mod_version=2100.1.0
-minecraft_version=1.21
+mod_version=2101.1.0
+minecraft_version=1.21.1
 
 # Deps
 #forge_version=50.0.9
-neoforge_version=21.0.10-beta
-
-# https://maven.neoforged.net/#/releases/net/neoforged/fancymodloader/loader
 neoforge_loader_version=4
+neoforge_version=21.1.9
+neoforge_version_range=[21.1.0,)
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_api_version=0.100.8+1.21
+fabric_api_version_range=>=0.100.1+1.21
 architectury_api_version=13.0.1
 
-ftb_library_version=2100.1.0
+ftb_library_version=2101.1.0
 
 curseforge_id_forge=404468
 curseforge_id_fabric=438497
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -39,7 +39,7 @@ processResources {
 	filesMatching("META-INF/neoforge.mods.toml") {
 		expand "version": project.version,
 				"archversion": project.architectury_api_version,
-				"neoforgeversion": project.neoforge_version,
+				"neoforgeversionrange": project.neoforge_version_range,
 				"neoforgeloaderversion": project.neoforge_loader_version,
 				"mcversion": project.minecraft_version,
 				"ftblibraryversion": project.ftb_library_version

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -15,7 +15,7 @@ FTB Teams adds ability to create your own teams that can be used for quests etc.
 [[dependencies.ftbteams]]
 modId = "neoforge"
 type  = "required"
-versionRange = "[${neoforgeversion},)"
+versionRange = "${neoforgeversionrange}"
 ordering = "NONE"
 side = "BOTH"