Merge pull request #20 from FTBTeam/1.20.4/dev

1.20.4/dev

Author: desht

Diff for: 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).
 
+## [3.0.4]
+
+### Added
+* Support for FTB Quests recipe querying for fluid tasks / fluid ingredients
+
 ## [3.0.3]
 
 ### Fixed

Diff for: common/src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/jei/FTBQuestsJEIIntegration.java

@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftbxmodcompat.ftbquests.jei;
 
+import dev.architectury.fluid.FluidStack;
 import dev.ftb.mods.ftbquests.client.ClientQuestFile;
 import dev.ftb.mods.ftbxmodcompat.FTBXModCompat;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.QuestItems;
@@ -74,4 +75,14 @@ public static void showRecipes(ItemStack stack) {
 					));
 		}
 	}
+
+	public static void showRecipes(FluidStack stack) {
+		if (runtime != null) {
+			var nativeStack = runtime.getJeiHelpers().getPlatformFluidHelper().create(stack.getFluid(), stack.getAmount());
+			runtime.getIngredientManager().getIngredientTypeChecked(nativeStack)
+					.ifPresent(type -> runtime.getRecipesGui().show(
+							runtime.getJeiHelpers().getFocusFactory().createFocus(RecipeIngredientRole.OUTPUT, type, nativeStack)
+					));
+		}
+	}
 }

Diff for: common/src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/jei/helper/JEIRecipeHelper.java

@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftbxmodcompat.ftbquests.jei.helper;
 
+import dev.architectury.fluid.FluidStack;
 import dev.ftb.mods.ftbxmodcompat.FTBXModCompat;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.jei.FTBQuestsJEIIntegration;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.jei.LootCrateRecipeManagerPlugin;
@@ -17,6 +18,11 @@ public void showRecipes(ItemStack itemStack) {
         FTBQuestsJEIIntegration.showRecipes(itemStack);
     }
 
+    @Override
+    public void showRecipes(FluidStack fluidStack) {
+        FTBQuestsJEIIntegration.showRecipes(fluidStack);
+    }
+
     @Override
     public String getHelperName() {
         return "JEI";

Diff for: common/src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/rei/FTBQuestsREIIntegration.java

@@ -1,25 +1,21 @@
 package dev.ftb.mods.ftbxmodcompat.ftbquests.rei;
 
+import dev.architectury.fluid.FluidStack;
 import dev.ftb.mods.ftbxmodcompat.FTBXModCompat;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.recipemod_common.WrappedLootCrate;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.recipemod_common.WrappedQuest;
-import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.entry.filtering.base.BasicFilteringRule;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
 import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
-import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
-import me.shedaniel.rei.api.client.registry.screen.ExclusionZonesProvider;
 import me.shedaniel.rei.api.client.view.ViewSearchBuilder;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.type.EntryDefinition;
+import me.shedaniel.rei.api.common.entry.type.EntryType;
 import me.shedaniel.rei.api.common.entry.type.EntryTypeRegistry;
 import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.world.item.ItemStack;
 
-import java.util.Collection;
-
 public class FTBQuestsREIIntegration implements REIClientPlugin {
     private static BasicFilteringRule.MarkDirty cratesChanged;
 
@@ -50,12 +46,17 @@ public void registerBasicEntryFiltering(BasicFilteringRule<?> rule) {
     }
 
     public static void showRecipes(ItemStack stack) {
-        for (EntryDefinition<?> definition : EntryTypeRegistry.getInstance().values()) {
-            if (definition.getType() == VanillaEntryTypes.ITEM) {
-                ViewSearchBuilder.builder()
-                        .addRecipesFor(EntryStack.of(VanillaEntryTypes.ITEM, stack))
-                        .open();
-            }
+        showRecipes(stack, VanillaEntryTypes.ITEM);
+    }
+
+    public static void showRecipes(FluidStack stack) {
+        showRecipes(stack, VanillaEntryTypes.FLUID);
+    }
+
+    private static <T> void showRecipes(T stack, EntryType<T> type) {
+        EntryDefinition<T> definition = EntryTypeRegistry.getInstance().get(type);
+        if (definition != null) {
+            ViewSearchBuilder.builder().addRecipesFor(EntryStack.of(definition, stack)).open();
         }
     }
 

Diff for: common/src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/rei/helper/REIRecipeHelper.java

@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftbxmodcompat.ftbquests.rei.helper;
 
+import dev.architectury.fluid.FluidStack;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.recipemod_common.BaseRecipeHelper;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.rei.FTBQuestsREIIntegration;
 import dev.ftb.mods.ftbxmodcompat.ftbquests.rei.LootCrateDisplayGenerator;
@@ -12,6 +13,11 @@ public void showRecipes(ItemStack stack) {
         FTBQuestsREIIntegration.showRecipes(stack);
     }
 
+    @Override
+    public void showRecipes(FluidStack stack) {
+        FTBQuestsREIIntegration.showRecipes(stack);
+    }
+
     @Override
     public String getHelperName() {
         return "REI";

Diff for: gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,forge,neoforge
 
 archives_base_name=ftb-xmod-compat
-mod_version=3.0.3
+mod_version=3.0.4
 maven_group=dev.ftb.mods
 curseforge_id=889915
 
@@ -16,8 +16,8 @@ fabric_api_version=0.96.4+1.20.4
 
 architectury_version=11.1.17
 
-ftb_library_version=2004.2.0
-ftb_quests_version=2004.2.0
+ftb_library_version=2004.2.4
+ftb_quests_version=2004.2.1
 ftb_chunks_version=2004.1.2
 ftb_ranks_version=2004.2.0
 ftb_essentials_version=2004.1.1

Diff for: neoforge/build.gradle

@@ -143,7 +143,7 @@ if (ENV.CURSEFORGE_KEY) {
         project {
             id = project.curseforge_id
             releaseType = ftbPublishing.relType
-            addGameVersion "Forge"
+            addGameVersion "NeoForge"
             addGameVersion project.minecraft_version
             mainArtifact(remapJar.archiveFile)
             relations {