diff options
| author | miozune <miozune@gmail.com> | 2023-12-04 06:26:09 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-03 22:26:09 +0100 |
| commit | b6caaf255da083516286321155ef339b60a07393 (patch) | |
| tree | 89416c1d29e63de37cb43295a81913de3c24e015 /src/main/java/gtPlusPlus/core/util | |
| parent | 4ff3ef790f4e22cc80986258f13f8a8643fda0dc (diff) | |
| download | GT5-Unofficial-b6caaf255da083516286321155ef339b60a07393.tar.gz GT5-Unofficial-b6caaf255da083516286321155ef339b60a07393.tar.bz2 GT5-Unofficial-b6caaf255da083516286321155ef339b60a07393.zip | |
Migrate to new RecipeMap (#788)
* Remove reference to GTPP_Recipe itself
* Remove GTPP_Recipe_Map_Internal
* Move recipemaps to separated class
* Remove unused recipemaps
* Migrate GT++ recipemaps
Remove sElementalDuplicatorRecipes in favor of GT replicatorRecipes supporting findRecipe
* Migrate the rest
* Adjust catalyst priorities
* Add ABS non-alloy recipe category
* Remove s prefixes from recipemaps
* Adapt to GT_StreamUtil rename
* Adjust recipe catalysts
* Fix build
* update gradle+bs+deps
(cherry picked from commit 8b185c7a4d881d38580cc98456265ebb751b6d93)
* update deps
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/util')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 170a741eed..6f7697de26 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.util.minecraft; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import java.util.HashMap; @@ -366,7 +366,7 @@ public class FluidUtils { aFullContainer, aEmptyContainer)) { GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1L)).itemOutputs(aFullContainer) - .fluidInputs(new FluidStack(rFluid, aFluidAmount)).duration(4).eut(1).addTo(sFluidCannerRecipes); + .fluidInputs(new FluidStack(rFluid, aFluidAmount)).duration(4).eut(1).addTo(fluidCannerRecipes); } return rFluid; } @@ -514,12 +514,12 @@ public class FluidUtils { if (dustStack != null) { GT_Values.RA.stdBuilder().itemInputs(dustStack) .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)).duration(1 * SECONDS).eut(16) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); } if (dustStack2 != null) { GT_Values.RA.stdBuilder().itemInputs(dustStack2) .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)).duration(1 * SECONDS).eut(16) - .addTo(sFluidExtractionRecipes); + .addTo(fluidExtractionRecipes); } return gtFluid; |