diff options
author | Technus <daniel112092@gmail.com> | 2017-08-14 13:36:24 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-08-14 13:48:13 +0200 |
commit | 2a86e40830a042094398eda84b3e4161220fc743 (patch) | |
tree | 9c87deab01e4064ce15efddea2d271be20eceb8a /src | |
parent | 8802433234e2b36867c6d4d10d32e76fbf57b6a6 (diff) | |
download | GT5-Unofficial-2a86e40830a042094398eda84b3e4161220fc743.tar.gz GT5-Unofficial-2a86e40830a042094398eda84b3e4161220fc743.tar.bz2 GT5-Unofficial-2a86e40830a042094398eda84b3e4161220fc743.zip |
Change to int to reduce casting needs
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java index d87ef5ed63..460a9aa056 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class TT_recipeAdder extends GT_RecipeAdder { - public static boolean addResearchableAssemblylineRecipe(ItemStack aResearchItem, int totalComputationRequired, short computationRequiredPerSec, int researchEUt, short researchAmperage, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int assDuration, int assEUt) { + public static boolean addResearchableAssemblylineRecipe(ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int assDuration, int assEUt) { if(aInputs==null)aInputs=new ItemStack[0]; if(aFluidInputs==null)aFluidInputs=new FluidStack[0]; if ((aResearchItem==null)||(totalComputationRequired<=0)||(aOutput == null) || aInputs.length>15) { @@ -23,7 +23,9 @@ public class TT_recipeAdder extends GT_RecipeAdder { } } if(researchAmperage<=0) researchAmperage=1; + else if(researchAmperage > Short.MAX_VALUE) researchAmperage=Short.MAX_VALUE; if(computationRequiredPerSec<=0) computationRequiredPerSec=1; + else if(computationRequiredPerSec > Short.MAX_VALUE) computationRequiredPerSec=Short.MAX_VALUE; TT_recipe.TT_Recipe_Map.sResearchableFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, null, null, totalComputationRequired, researchEUt, researchAmperage|(computationRequiredPerSec<<16)); GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")}, aFluidInputs, null, assDuration, assEUt, 0,true); GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( aResearchItem, 0/*ignored*/, aInputs, aFluidInputs, aOutput, assDuration, assEUt)); |