diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-28 16:58:39 +1000 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-28 16:58:39 +1000 |
commit | c0669bb2a46b898141643be6b8f621c964c32c8b (patch) | |
tree | 0163a8ea62a85eb006eea43bd5d4d248202685b5 /src/Java/gregtech/api/util/Recipe_GT.java | |
parent | 3915e405a70be4d9523ace59a9194a3757cb5a37 (diff) | |
download | GT5-Unofficial-c0669bb2a46b898141643be6b8f621c964c32c8b.tar.gz GT5-Unofficial-c0669bb2a46b898141643be6b8f621c964c32c8b.tar.bz2 GT5-Unofficial-c0669bb2a46b898141643be6b8f621c964c32c8b.zip |
+ Added support for IC2C. (Support means that the game will load if this mod exists.. maybe? Should fix #287, I guess.)
+ Added tooltips to turbines if the animated textures are on, if user holds shift full tooltip will be shown.
- Removed some Thaumcraft logging.
% More changes to fix NEI handler for Multiblocks.
% Moved Tooltip handling for a few things from the EIO handler to a generic handler.
$ Fixed %'s not showing (third time lucky) on NEI pages.
Diffstat (limited to 'src/Java/gregtech/api/util/Recipe_GT.java')
-rw-r--r-- | src/Java/gregtech/api/util/Recipe_GT.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index c06b609391..e17209ef91 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -922,7 +922,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]); aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]); - Recipe_GT mNew = new GT_Recipe_LargeCentrifuge(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, 0); + Recipe_GT mNew = new GT_Recipe_LargeCentrifuge(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) { return this.addRecipe(mNew); } @@ -993,7 +993,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ if (mColumn <= 2 && mRow <= 3) outputStacks.add( (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], this.getOutputChance(i))); } return outputStacks; } @@ -1087,7 +1087,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]); aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]); - Recipe_GT mNew = new GT_Recipe_LargeElectrolyzer(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, 0); + Recipe_GT mNew = new GT_Recipe_LargeElectrolyzer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) { return this.addRecipe(mNew); } @@ -1160,7 +1160,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ if (mColumn <= 2 && mRow <= 3) outputStacks.add( (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], this.getOutputChance(i))); } return outputStacks; } @@ -1255,7 +1255,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]); aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]); - Recipe_GT mNew = new GT_Recipe_AdvFreezer(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, 0); + Recipe_GT mNew = new GT_Recipe_AdvFreezer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) { return this.addRecipe(mNew); } @@ -1310,12 +1310,12 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ for (int i = 0; i < itemLimit; ++i) { if (this.mOutputs[i] != null) outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) this.mOutputs[i].copy(), 102 + i * 18, 5, ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) this.mOutputs[i].copy(), 102 + i * 18, 5, this.getOutputChance(i))); } for (int i = 0; i < fluidLimit; ++i) { if (this.mFluidOutputs[i] != null) outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( - (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23, ((this.mChances.length-1) >= i ? this.mChances[i] : 10000))); + (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23, this.getOutputChance(i))); } return outputStacks; } |