aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material/MaterialStack.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/MaterialStack.java')
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialStack.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/Java/gtPlusPlus/core/material/MaterialStack.java
index ad3aa2fa76..f8b9b35bd8 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialStack.java
@@ -8,7 +8,7 @@ public class MaterialStack {
final Material materialInput;
final double percentageToUse;
- public MaterialStack(Material inputs, int percentage){
+ public MaterialStack(Material inputs, double percentage){
this.materialInput = inputs;
this.percentageToUse = percentage;
@@ -21,20 +21,26 @@ public class MaterialStack {
int amount = 0;
if (percentageToUse >= 0 && percentageToUse <= 0.99){
caseStatus = 1;
- amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(2));
+ amount = (int) (1/percentageToUse);
+ //amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(2));
}
else if (percentageToUse >= 1 && percentageToUse <= 9.99){
caseStatus = 2;
- amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(0));
+ amount = (int) (percentageToUse);
+ //amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(0));
}
else if (percentageToUse >= 10 && percentageToUse <= 99.99){
caseStatus = 3;
- amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(0));
+ amount = (int) (percentageToUse/10);
+ //amount = Integer.valueOf(String.valueOf(percentageToUse).charAt(0));
}
else if (percentageToUse == 100){
caseStatus = 4;
amount = 10;
}
+ else {
+ amount = 0;
+ }
switch (caseStatus) {
case 1: {
return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+materialInput.unlocalizedName, amount);