aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-14 04:35:19 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-14 04:35:19 +1000
commit3ebad08c9f1c0ebe1150e2a9db332f4ea476cc33 (patch)
tree31f1ced38c40358a54f1a994bc2850245633a8b9 /src/Java/gtPlusPlus/core/item
parent2d5bc4bf0e324979c58ed8b35283a2a78b50ad01 (diff)
downloadGT5-Unofficial-3ebad08c9f1c0ebe1150e2a9db332f4ea476cc33.tar.gz
GT5-Unofficial-3ebad08c9f1c0ebe1150e2a9db332f4ea476cc33.tar.bz2
GT5-Unofficial-3ebad08c9f1c0ebe1150e2a9db332f4ea476cc33.zip
I think only shape(less) recipes for Small/Tiny dusts & implementing recipe cost based on mass, not just what I feel like. lol
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index b5e303ff7a..b94b7759da 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -136,21 +136,21 @@ public class BaseItemDust extends Item{
ItemStack tempStack = UtilsItems.getSimpleStack(this);
ItemStack tempOutput = null;
ItemStack[] inputStacks = dustInfo.getMaterialComposites();
- ItemStack[] outputStacks = {dustInfo.getDust()};
+ ItemStack[] outputStacks = {dustInfo.getDust(10)};
String temp = "";
Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName());
- if (getUnlocalizedName().contains("item.")){
+ if (getUnlocalizedName().toLowerCase().contains("item.")){
temp = getUnlocalizedName().replace("item.", "");
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
}
else {
temp = getUnlocalizedName();
}
- if (temp.contains("DustTiny")){
+ if (temp.toLowerCase().contains("dusttiny")){
temp = temp.replace("itemDustTiny", "dust");
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
}
- else if (temp.contains("DustSmall")){
+ else if (temp.toLowerCase().contains("dustsmall")){
temp = temp.replace("itemDustSmall", "dust");
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
}
@@ -158,9 +158,9 @@ public class BaseItemDust extends Item{
temp = temp.replace("itemD", "d");
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
}
- if (temp != null && temp != ""){
+ if (temp != null && temp != "" && !temp.equals("")){
- if (getUnlocalizedName().contains("DustTiny") || getUnlocalizedName().contains("DustSmall")){
+ if (getUnlocalizedName().toLowerCase().contains("dusttiny") || getUnlocalizedName().toLowerCase().contains("dustsmall")){
tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
}
else {
@@ -175,6 +175,10 @@ public class BaseItemDust extends Item{
}
}
+
+ if (tempOutput == null){
+ tempOutput = dustInfo.getDust(1);
+ }
if (tempOutput != null){
if (getUnlocalizedName().contains("DustTiny")){
@@ -204,7 +208,7 @@ public class BaseItemDust extends Item{
ItemStack tempStackForAName = inputStacks[i];
String[] inputList = UtilsItems.getArrayStackNamesAsArray(dustInfo.getMaterialComposites());
int[] inputSizes = dustInfo.getMaterialCompositeStackSizes();
- inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], inputSizes[i]);
+ inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], 1);
Utils.LOG_WARNING("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+".");
}
@@ -267,7 +271,7 @@ public class BaseItemDust extends Item{
tempIngot = tempIngot.replace("itemDust", "ingot");
Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
- ItemStack[] outputStacks = {dustInfo.getDust()};
+ ItemStack[] outputStacks = {dustInfo.getDust(1)};
if (tempIngot != null && tempIngot != ""){
tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1);