Merge pull request #699 from FTBTeam/dev

Dev
FTBTeam · Oct 4, 2023 · 563e1f8 · 563e1f8
2 parents cbe0131 + c15b705
commit 563e1f8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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).
 
+## [2001.1.6]
+
+### Fixed
+* Fixed client crash when using Task Screens with energy tasks
+* The output of `/ftbquests reset_progress` is now just sent to the command issuer, not all online admins
+
 ## [2001.1.5]
 
 ### Added

diff --git a/common/src/main/java/dev/ftb/mods/ftbquests/command/FTBQuestsCommands.java b/common/src/main/java/dev/ftb/mods/ftbquests/command/FTBQuestsCommands.java
@@ -303,7 +303,7 @@ private static int changeProgress(CommandSourceStack source, Collection<ServerPl
 			questObject.forceProgress(ServerQuestFile.INSTANCE.getOrCreateTeamData(player), progressChange);
 		}
 
-		source.sendSuccess(() -> Component.translatable("commands.ftbquests.change_progress.text"), true);
+		source.sendSuccess(() -> Component.translatable("commands.ftbquests.change_progress.text"), false);
 		return Command.SINGLE_SUCCESS;
 	}
 

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -88,6 +88,7 @@ if (ENV.CURSEFORGE_KEY) {
 				requiredDependency 'ftb-library-fabric'
 				requiredDependency 'ftb-teams-fabric'
 				requiredDependency 'item-filters'
+				optionalDependency 'ftb-xmod-compat'
 			}
 			changelog = ENV.CHANGELOG  // expected to exist if ENV.CURSEFORGE_KEY does
 			changelogType = 'markdown'

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -96,6 +96,7 @@ if (ENV.CURSEFORGE_KEY) {
 				requiredDependency 'ftb-library-forge'
 				requiredDependency 'ftb-teams-forge'
 				requiredDependency 'item-filters'
+				optionalDependency 'ftb-xmod-compat'
 			}
 			changelog = ENV.CHANGELOG  // expected to exist if ENV.CURSEFORGE_KEY does
 			changelogType = 'markdown'

diff --git a/forge/src/main/java/dev/ftb/mods/ftbquests/forge/ClientSetup.java b/forge/src/main/java/dev/ftb/mods/ftbquests/forge/ClientSetup.java
@@ -3,10 +3,12 @@
 import dev.ftb.mods.ftbquests.client.FTBQuestsClientEventHandler;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 public class ClientSetup {
     public static void init() {
-        MinecraftForge.EVENT_BUS.addListener(ClientSetup::onTextureStitch);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onTextureStitch);
     }
 
     private static void onTextureStitch(TextureStitchEvent.Post event) {

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ mod_id=ftbquests
 archives_base_name=ftb-quests
 minecraft_version=1.20.1
 # Build time
-mod_version=2001.1.5
+mod_version=2001.1.6
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 # Curse release