diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/MaterialStack.java')
-rw-r--r-- | src/Java/gtPlusPlus/core/material/MaterialStack.java | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/Java/gtPlusPlus/core/material/MaterialStack.java index 710a9b645a..e18d738b97 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialStack.java +++ b/src/Java/gtPlusPlus/core/material/MaterialStack.java @@ -1,10 +1,9 @@ package gtPlusPlus.core.material; -import gtPlusPlus.core.util.item.ItemUtils; - import java.math.BigDecimal; import java.math.RoundingMode; +import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; public class MaterialStack { @@ -16,27 +15,27 @@ public class MaterialStack { public MaterialStack(final Material inputs, final double partOutOf100){ this.stackMaterial = inputs; this.vPercentageToUse = partOutOf100; - this.vAmount = math(partOutOf100); + this.vAmount = this.math(partOutOf100); } @SuppressWarnings("static-method") - private int[] math(final double val){ + private int[] math(final double val){ double i; //Cast to a BigDecimal to round it. final BigDecimal bd = new BigDecimal(val).setScale(2, RoundingMode.HALF_EVEN); i = bd.doubleValue(); //Split the string into xx.xx final String[] arr=String.valueOf(i).split("\\."); - int[] intArr=new int[2]; + final int[] intArr=new int[2]; intArr[0]=Integer.parseInt(arr[0]); intArr[1]=Integer.parseInt(arr[1]); return intArr; } - + public ItemStack getValidStack(){ if (this.stackMaterial.getDust(1) == null){ //if (this.stackMaterial.getCell(1) == null){ - return null; + return null; //} //return this.stackMaterial.getCell(this.vAmount[0]); } @@ -46,26 +45,26 @@ public class MaterialStack { public ItemStack getDustStack(){ return this.stackMaterial.getDust(this.vAmount[0]); } - + public ItemStack getDustStack(final int amount){ return this.stackMaterial.getDust(amount); } - + public Material getStackMaterial(){ return this.stackMaterial; } - + public double getvPercentageToUse(){ return this.vPercentageToUse; } - + public long[] getSmallestStackSizes(){ - return this.stackMaterial.getSmallestRatio(stackMaterial.getComposites()); + return this.stackMaterial.getSmallestRatio(this.stackMaterial.getComposites()); } - + public int getPartsPerOneHundred(){ if (this.vAmount != null){ - if (this.vAmount[0] >= 1 && this.vAmount[0] <= 100){ + if ((this.vAmount[0] >= 1) && (this.vAmount[0] <= 100)){ return this.vAmount[0]; } } @@ -74,21 +73,21 @@ public class MaterialStack { public ItemStack getLeftOverStacksFromDecimalValue(){ final int temp = this.vAmount[1]; int getCount; - if (temp >= 25 && temp <=99){ + if ((temp >= 25) && (temp <=99)){ getCount = temp/25; return this.stackMaterial.getSmallDust(getCount); } - else if (temp >= 11 && temp <= 24){ + else if ((temp >= 11) && (temp <= 24)){ getCount = temp/11; return this.stackMaterial.getTinyDust(getCount); } else { return null; - } + } } public ItemStack[] getValidItemStacks(){ - return ItemUtils.validItemsForOreDict(stackMaterial.getUnlocalizedName()); + return ItemUtils.validItemsForOreDict(this.stackMaterial.getUnlocalizedName()); } |