diff options
| author | miozune <miozune@gmail.com> | 2024-09-09 09:21:25 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 02:21:25 +0200 |
| commit | c43cdd94e65c6e19d8380d1b2c87ce19d5d49011 (patch) | |
| tree | 67e104846c6122fdc2eaf2dcc29717facd6a51df /src/main/java/gregtech/common/tools | |
| parent | b15f89a14827bdb621d45745d165e1caf4265fef (diff) | |
| download | GT5-Unofficial-c43cdd94e65c6e19d8380d1b2c87ce19d5d49011.tar.gz GT5-Unofficial-c43cdd94e65c6e19d8380d1b2c87ce19d5d49011.tar.bz2 GT5-Unofficial-c43cdd94e65c6e19d8380d1b2c87ce19d5d49011.zip | |
Remove findRecipe methods (#3084)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/common/tools')
| -rw-r--r-- | src/main/java/gregtech/common/tools/ToolHardHammer.java | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tools/ToolJackHammer.java | 12 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/tools/ToolHardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java index d26fe2b43d..a5b0a38ee5 100644 --- a/src/main/java/gregtech/common/tools/ToolHardHammer.java +++ b/src/main/java/gregtech/common/tools/ToolHardHammer.java @@ -1,7 +1,5 @@ package gregtech.common.tools; -import static gregtech.GTMod.MAX_IC2; - import java.util.Arrays; import java.util.List; @@ -133,12 +131,16 @@ public class ToolHardHammer extends GTTool { public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { int rConversions = 0; - GTRecipe tRecipe = RecipeMaps.hammerRecipes - .findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData)); + GTRecipe tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery() + .items(new ItemStack(aBlock, 1, aMetaData)) + .notUnificated(true) + .find(); if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) { for (ItemStack tDrop : aDrops) { - tRecipe = RecipeMaps.hammerRecipes - .findRecipe(null, true, MAX_IC2, null, GTUtility.copyAmount(1, tDrop)); + tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery() + .items(GTUtility.copyAmount(1, tDrop)) + .notUnificated(true) + .find(); if (tRecipe != null) { ItemStack tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { diff --git a/src/main/java/gregtech/common/tools/ToolJackHammer.java b/src/main/java/gregtech/common/tools/ToolJackHammer.java index 6c46a4c9be..bc0a7ddcc0 100644 --- a/src/main/java/gregtech/common/tools/ToolJackHammer.java +++ b/src/main/java/gregtech/common/tools/ToolJackHammer.java @@ -78,12 +78,16 @@ public class ToolJackHammer extends ToolDrillLV { public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { int rConversions = 0; - GTRecipe tRecipe = RecipeMaps.hammerRecipes - .findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData)); + GTRecipe tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery() + .items(new ItemStack(aBlock, 1, aMetaData)) + .notUnificated(true) + .find(); if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) { for (ItemStack tDrop : aDrops) { - tRecipe = RecipeMaps.hammerRecipes - .findRecipe(null, true, 2147483647L, null, GTUtility.copyAmount(1, tDrop)); + tRecipe = RecipeMaps.hammerRecipes.findRecipeQuery() + .items(GTUtility.copyAmount(1, tDrop)) + .notUnificated(true) + .find(); if (tRecipe != null) { ItemStack tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { |